Skip to content

Commit

Permalink
test: use a fixed app.version to avoid snapshot invalidations on ne…
Browse files Browse the repository at this point in the history
…w releases
  • Loading branch information
chgl committed Nov 8, 2023
1 parent 166db67 commit 8681a7b
Show file tree
Hide file tree
Showing 16 changed files with 69 additions and 106 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(
classes = {
FhirProperties.class,
ObdsConditionMapper.class,
ObdsMedicationStatementMapper.class,
ObdsObservationMapper.class,
ObdsProcedureMapper.class,
ObdsPatientMapper.class,
ObdsConditionMapper.class
})
@EnableConfigurationProperties()
public class ObdsConditionProcessorTest extends ObdsProcessorTest {

class ObdsConditionProcessorTest extends ObdsProcessorTest {

private static final Logger log = LoggerFactory.getLogger(ObdsConditionProcessorTest.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(
classes = {
FhirProperties.class,
ObdsConditionMapper.class,
ObdsMedicationStatementMapper.class,
ObdsObservationMapper.class,
ObdsProcedureMapper.class,
ObdsPatientMapper.class,
ObdsConditionMapper.class
})
@EnableConfigurationProperties()
public class ObdsMedicationStatementProcessorTest extends ObdsProcessorTest {

class ObdsMedicationStatementProcessorTest extends ObdsProcessorTest {

private static final Logger log =
LoggerFactory.getLogger(ObdsMedicationStatementProcessorTest.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(
classes = {
FhirProperties.class,
ObdsConditionMapper.class,
ObdsMedicationStatementMapper.class,
ObdsObservationMapper.class,
ObdsProcedureMapper.class,
ObdsPatientMapper.class,
ObdsConditionMapper.class
})
@EnableConfigurationProperties()
public class ObdsObservationProcessorTest extends ObdsProcessorTest {

class ObdsObservationProcessorTest extends ObdsProcessorTest {

private static final Logger log = LoggerFactory.getLogger(ObdsObservationProcessorTest.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.miracum.streams.ume.obdstofhir.FhirProperties;
import org.miracum.streams.ume.obdstofhir.mapper.*;
import org.miracum.streams.ume.obdstofhir.model.Tupel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(classes = {ObdsPatientMapper.class, FhirProperties.class})
@EnableConfigurationProperties()
class ObdsPatientMapperTest extends ObdsProcessorTest {

private final ObdsPatientMapper onkoPatientMapper;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest(
classes = {
FhirProperties.class,
ObdsConditionMapper.class,
ObdsMedicationStatementMapper.class,
ObdsObservationMapper.class,
ObdsProcedureMapper.class,
ObdsPatientMapper.class,
ObdsConditionMapper.class
})
@EnableConfigurationProperties()
public class ObdsProcedureProcessorTest extends ObdsProcessorTest {

class ObdsProcedureProcessorTest extends ObdsProcessorTest {

private static final Logger log = LoggerFactory.getLogger(ObdsProcedureProcessorTest.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,33 @@
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.junit.jupiter.api.BeforeAll;
import org.miracum.streams.ume.obdstofhir.FhirProperties;
import org.miracum.streams.ume.obdstofhir.mapper.ObdsConditionMapper;
import org.miracum.streams.ume.obdstofhir.mapper.ObdsMedicationStatementMapper;
import org.miracum.streams.ume.obdstofhir.mapper.ObdsObservationMapper;
import org.miracum.streams.ume.obdstofhir.mapper.ObdsPatientMapper;
import org.miracum.streams.ume.obdstofhir.mapper.ObdsProcedureMapper;
import org.miracum.streams.ume.obdstofhir.model.MeldungExport;
import org.miracum.streams.ume.obdstofhir.model.MeldungExportList;
import org.miracum.streams.ume.obdstofhir.model.Tupel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.util.ResourceUtils;

@SpringBootTest(
classes = {
FhirProperties.class,
ObdsConditionMapper.class,
ObdsMedicationStatementMapper.class,
ObdsObservationMapper.class,
ObdsProcedureMapper.class,
ObdsPatientMapper.class,
ObdsConditionMapper.class
},
properties = {"app.version=0.0.0-test"})
@EnableConfigurationProperties()
public abstract class ObdsProcessorTest {

private static final Logger log = LoggerFactory.getLogger(ObdsProcessorTest.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"resourceType": "Condition",
"id": "a90ae2425e2d00616e04da0617c3617740c6f11363cc31df696eef9c06235616",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Condition-Primaerdiagnose" ]
},
"extension": [ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"resourceType": "Condition",
"id": "a90ae2425e2d00616e04da0617c3617740c6f11363cc31df696eef9c06235616",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Condition-Primaerdiagnose" ]
},
"extension": [ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"resourceType": "Condition",
"id": "438ded78a47f0cc1921fd82237f9c5aaca5fa381ef2e5b4e65538087dd08d47c",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Condition-Primaerdiagnose" ]
},
"code": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"resourceType": "MedicationStatement",
"id": "3a6f9e3df20464337ff932ea9833acdfc92c3dd4afa444f2d1bf900627eec020",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-MedicationStatement-Systemtherapie" ]
},
"extension": [ {
Expand Down Expand Up @@ -74,7 +74,7 @@
"resourceType": "MedicationStatement",
"id": "ea3bdcd0ac67e6103589595775d905b521ca5ce5370018e7b738e0806fde2821",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-MedicationStatement-Systemtherapie" ]
},
"extension": [ {
Expand Down Expand Up @@ -141,7 +141,7 @@
"resourceType": "MedicationStatement",
"id": "3eb18c984d23b8a3bbf02fe2c2cb385c5f9ec86602c8fb2749dae763b1ad79e5",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-MedicationStatement-Systemtherapie" ]
},
"extension": [ {
Expand Down Expand Up @@ -208,7 +208,7 @@
"resourceType": "MedicationStatement",
"id": "328a01d32491f06ac6ab8564d059cc313390645329af4539a2185cafb7c92c8d",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-MedicationStatement-Systemtherapie" ]
},
"extension": [ {
Expand Down Expand Up @@ -275,7 +275,7 @@
"resourceType": "MedicationStatement",
"id": "d2aa80723b3d9fa509c68ef373c0963fb20bffe801aeecc72c81c806160ddd0f",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-MedicationStatement-Systemtherapie" ]
},
"extension": [ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"resourceType": "Observation",
"id": "4d8b7cdb7f7e81ecfeceafb96ac5c4390ae37be6b3b38f21ba315389dccb040b",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Histologie" ]
},
"status": "final",
Expand Down Expand Up @@ -60,7 +60,7 @@
"resourceType": "Observation",
"id": "98af71c27bc7328e3d2e184eca58d8e402a246efda16516f5382efba6fda4e50",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Grading" ]
},
"status": "final",
Expand Down Expand Up @@ -110,7 +110,7 @@
"resourceType": "Observation",
"id": "fc7cabc6beffc1605c782aa46a8a32df94aa5ef01b9c828e0671e2a643d0a2bc",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-TNMc" ]
},
"status": "final",
Expand Down Expand Up @@ -229,7 +229,7 @@
"resourceType": "Observation",
"id": "555236ab41f9cc4e258c40c578b4ffbcb355055b8977706c983a3f338b6298b1",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-TNMp" ]
},
"status": "final",
Expand Down Expand Up @@ -348,7 +348,7 @@
"resourceType": "Observation",
"id": "7b3181b44891bb7bba0f7ebb2511285589df40eb54a6073e390ed8550fc3ad8d",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -405,7 +405,7 @@
"resourceType": "Observation",
"id": "aa0f0ae0f151114fd167c207b9216685244dd8a17739f01e2e3fda9cada6491a",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -462,7 +462,7 @@
"resourceType": "Observation",
"id": "a0bac97bc3de3b565faba74d49c0b6eb43751b07fa5deda2f63b75eb8db66147",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -519,7 +519,7 @@
"resourceType": "Observation",
"id": "302e6b7f1b82d044c443cd186dad3eb3470351b10d6e0808fefcf9c99c354753",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -576,7 +576,7 @@
"resourceType": "Observation",
"id": "734471546228b0e9385706399d6eeef9860ab8cb67536c07a0d9712d7bea302d",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -633,7 +633,7 @@
"resourceType": "Observation",
"id": "caeb45a6afede2449dbf70201c0f5db2670dd8a0092432cfaa4f4b46bb4b4b18",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-TodUrsache" ]
},
"status": "final",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"resourceType": "Observation",
"id": "4d8b7cdb7f7e81ecfeceafb96ac5c4390ae37be6b3b38f21ba315389dccb040b",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Histologie" ]
},
"status": "final",
Expand Down Expand Up @@ -60,7 +60,7 @@
"resourceType": "Observation",
"id": "98af71c27bc7328e3d2e184eca58d8e402a246efda16516f5382efba6fda4e50",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Grading" ]
},
"status": "final",
Expand Down Expand Up @@ -110,7 +110,7 @@
"resourceType": "Observation",
"id": "fc7cabc6beffc1605c782aa46a8a32df94aa5ef01b9c828e0671e2a643d0a2bc",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-TNMc" ]
},
"status": "final",
Expand Down Expand Up @@ -229,7 +229,7 @@
"resourceType": "Observation",
"id": "555236ab41f9cc4e258c40c578b4ffbcb355055b8977706c983a3f338b6298b1",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-TNMp" ]
},
"status": "final",
Expand Down Expand Up @@ -298,7 +298,7 @@
"resourceType": "Observation",
"id": "7b3181b44891bb7bba0f7ebb2511285589df40eb54a6073e390ed8550fc3ad8d",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -355,7 +355,7 @@
"resourceType": "Observation",
"id": "aa0f0ae0f151114fd167c207b9216685244dd8a17739f01e2e3fda9cada6491a",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -412,7 +412,7 @@
"resourceType": "Observation",
"id": "a0bac97bc3de3b565faba74d49c0b6eb43751b07fa5deda2f63b75eb8db66147",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -469,7 +469,7 @@
"resourceType": "Observation",
"id": "302e6b7f1b82d044c443cd186dad3eb3470351b10d6e0808fefcf9c99c354753",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down Expand Up @@ -526,7 +526,7 @@
"resourceType": "Observation",
"id": "734471546228b0e9385706399d6eeef9860ab8cb67536c07a0d9712d7bea302d",
"meta": {
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER_ONKOSTAR.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Fernmetastasen" ]
},
"status": "final",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"resourceType": "Patient",
"id": "cb07d6456df4982ff6b8de92fc018b0d5fc9dab1d1e303e97bd0474699111b52",
"meta": {
"source": "UKER.ONKOSTAR:obds-to-fhir:2.0.3",
"source": "UKER.ONKOSTAR:obds-to-fhir:0.0.0-test",
"profile": [ "https://www.medizininformatik-initiative.de/fhir/core/modul-person/StructureDefinition/PatientPseudonymisiert" ]
},
"identifier": [ {
Expand Down
Loading

0 comments on commit 8681a7b

Please sign in to comment.