Skip to content
This repository was archived by the owner on Oct 6, 2025. It is now read-only.

Commit e21f00f

Browse files
schwzrschwzr
committed
re-enabled tests
1 parent 56a883a commit e21f00f

6 files changed

Lines changed: 53 additions & 34 deletions

File tree

‎codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/client/fhir/AbstractFhirClientTest.java‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.client.fhir;
22

33
import static de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.ConstantsDataTransfer.NAMING_SYSTEM_NUM_CODEX_DIC_PSEUDONYM;
4-
import static org.junit.Assert.assertEquals;
5-
import static org.junit.Assert.assertNotNull;
6-
import static org.junit.Assert.assertTrue;
4+
import static org.junit.Assert.*;
75
import static org.mockito.Mockito.CALLS_REAL_METHODS;
86
import static org.mockito.Mockito.when;
97

@@ -14,7 +12,6 @@
1412
import java.util.Date;
1513

1614
import org.hl7.fhir.r4.model.Bundle;
17-
import org.junit.Ignore;
1815
import org.junit.Test;
1916
import org.mockito.Mockito;
2017
import org.slf4j.Logger;
@@ -26,7 +23,6 @@
2623
import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.domain.DateWithPrecision;
2724
import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.logging.DataLogger;
2825

29-
@Ignore
3026
public class AbstractFhirClientTest
3127
{
3228
private static final Logger logger = LoggerFactory.getLogger(AbstractFhirClientTest.class);
@@ -38,7 +34,7 @@ public void testSetSearchBundleWithExportTo() throws Exception
3834
DataStoreClient dataClient = Mockito.mock(DataStoreClient.class);
3935
DataLogger dataLogger = Mockito.mock(DataLogger.class);
4036
when(dataClient.getSearchBundleOverride())
41-
.thenReturn(Paths.get("src/main/resources/fhir/Bundle/SearchBundle.xml"));
37+
.thenReturn(Paths.get("src/test/resources/fhir/Bundle/SearchBundle.xml"));
4238
when(dataClient.getFhirContext()).thenReturn(fhirContext);
4339
AbstractFhirClient client = Mockito.mock(AbstractFhirClient.class,
4440
Mockito.withSettings().useConstructor(dataClient, dataLogger).defaultAnswer(CALLS_REAL_METHODS));
@@ -71,7 +67,7 @@ public void testSetSearchBundleWithExportFromAndExportTo() throws Exception
7167
DataStoreClient dataClient = Mockito.mock(DataStoreClient.class);
7268
DataLogger dataLogger = Mockito.mock(DataLogger.class);
7369
when(dataClient.getSearchBundleOverride())
74-
.thenReturn(Paths.get("src/main/resources/fhir/Bundle/SearchBundle.xml"));
70+
.thenReturn(Paths.get("src/test/resources/fhir/Bundle/SearchBundle.xml"));
7571
when(dataClient.getFhirContext()).thenReturn(fhirContext);
7672
AbstractFhirClient client = Mockito.mock(AbstractFhirClient.class,
7773
Mockito.withSettings().useConstructor(dataClient, dataLogger).defaultAnswer(CALLS_REAL_METHODS));
@@ -106,7 +102,7 @@ public void testSetSearchBundleWithPatientIdAndExportFromAndExportTo() throws Ex
106102
DataStoreClient dataClient = Mockito.mock(DataStoreClient.class);
107103
DataLogger dataLogger = Mockito.mock(DataLogger.class);
108104
when(dataClient.getSearchBundleOverride())
109-
.thenReturn(Paths.get("src/main/resources/fhir/Bundle/SearchBundle.xml"));
105+
.thenReturn(Paths.get("src/test/resources/fhir/Bundle/SearchBundle.xml"));
110106
when(dataClient.getFhirContext()).thenReturn(fhirContext);
111107
AbstractFhirClient client = Mockito.mock(AbstractFhirClient.class,
112108
Mockito.withSettings().useConstructor(dataClient, dataLogger).defaultAnswer(CALLS_REAL_METHODS));
@@ -142,7 +138,7 @@ public void testSetSearchBundleWithPseudonymIdAndExportFromAndExportTo() throws
142138
DataStoreClient dataClient = Mockito.mock(DataStoreClient.class);
143139
DataLogger dataLogger = Mockito.mock(DataLogger.class);
144140
when(dataClient.getSearchBundleOverride())
145-
.thenReturn(Paths.get("src/main/resources/fhir/Bundle/SearchBundle.xml"));
141+
.thenReturn(Paths.get("src/test/resources/fhir/Bundle/SearchBundle.xml"));
146142
when(dataClient.getFhirContext()).thenReturn(fhirContext);
147143
AbstractFhirClient client = Mockito.mock(AbstractFhirClient.class,
148144
Mockito.withSettings().useConstructor(dataClient, dataLogger).defaultAnswer(CALLS_REAL_METHODS));

‎codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/validation/MiiTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.util.stream.Stream;
2323

2424
import org.bouncycastle.pkcs.PKCSException;
25-
import org.junit.Ignore;
2625
import org.junit.Test;
2726
import org.slf4j.Logger;
2827
import org.slf4j.LoggerFactory;
@@ -38,7 +37,6 @@
3837
import de.rwh.utils.crypto.io.PemIo;
3938
import dev.dsf.fhir.validation.ValueSetExpanderImpl;
4039

41-
@Ignore
4240
public class MiiTest
4341
{
4442
private static final Logger logger = LoggerFactory.getLogger(MiiTest.class);

‎codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/validation/ValidateDataLearningTest.java‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,7 @@
1414
import java.security.cert.Certificate;
1515
import java.security.cert.CertificateException;
1616
import java.security.cert.X509Certificate;
17-
import java.util.Arrays;
18-
import java.util.Comparator;
19-
import java.util.EnumSet;
20-
import java.util.HashSet;
21-
import java.util.List;
22-
import java.util.Map;
23-
import java.util.Properties;
24-
import java.util.Set;
25-
import java.util.UUID;
17+
import java.util.*;
2618
import java.util.function.Consumer;
2719
import java.util.function.Function;
2820
import java.util.stream.Collectors;
@@ -31,21 +23,13 @@
3123
import org.hl7.fhir.common.hapi.validation.support.CommonCodeSystemsTerminologyService;
3224
import org.hl7.fhir.common.hapi.validation.support.InMemoryTerminologyServerValidationSupport;
3325
import org.hl7.fhir.common.hapi.validation.support.ValidationSupportChain;
34-
import org.hl7.fhir.r4.model.Bundle;
26+
import org.hl7.fhir.r4.model.*;
3527
import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
36-
import org.hl7.fhir.r4.model.CanonicalType;
37-
import org.hl7.fhir.r4.model.ElementDefinition;
3828
import org.hl7.fhir.r4.model.ElementDefinition.TypeRefComponent;
3929
import org.hl7.fhir.r4.model.Enumerations.BindingStrength;
40-
import org.hl7.fhir.r4.model.OperationOutcome;
41-
import org.hl7.fhir.r4.model.Resource;
42-
import org.hl7.fhir.r4.model.StringType;
43-
import org.hl7.fhir.r4.model.StructureDefinition;
44-
import org.hl7.fhir.r4.model.ValueSet;
4530
import org.hl7.fhir.r4.model.ValueSet.ValueSetComposeComponent;
4631
import org.hl7.fhir.r4.model.ValueSet.ValueSetExpansionComponent;
4732
import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
48-
import org.junit.Ignore;
4933
import org.junit.Test;
5034
import org.slf4j.Logger;
5135
import org.slf4j.LoggerFactory;
@@ -67,7 +51,6 @@
6751
import dev.dsf.fhir.validation.ValidationSupportWithCustomResources;
6852
import dev.dsf.fhir.validation.ValueSetExpanderImpl;
6953

70-
@Ignore
7154
public class ValidateDataLearningTest
7255
{
7356
private static final Logger logger = LoggerFactory.getLogger(ValidateDataLearningTest.class);

‎codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/fhir/profile/ActivityDefinitionProfileTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import org.hl7.fhir.r4.model.ActivityDefinition;
1010
import org.junit.ClassRule;
11-
import org.junit.Ignore;
1211
import org.junit.Test;
1312
import org.slf4j.Logger;
1413
import org.slf4j.LoggerFactory;
@@ -22,7 +21,6 @@
2221
import dev.dsf.fhir.validation.ResourceValidatorImpl;
2322
import dev.dsf.fhir.validation.ValidationSupportRule;
2423

25-
@Ignore
2624
public class ActivityDefinitionProfileTest
2725
{
2826
private static final Logger logger = LoggerFactory.getLogger(ActivityDefinitionProfileTest.class);

‎codex-process-data-transfer/src/test/java/de/netzwerk_universitaetsmedizin/codex/processes/fhir/profile/TaskProfileTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import org.hl7.fhir.r4.model.Task.TaskStatus;
6363
import org.hl7.fhir.r4.model.UnsignedIntType;
6464
import org.junit.ClassRule;
65-
import org.junit.Ignore;
6665
import org.junit.Test;
6766
import org.slf4j.Logger;
6867
import org.slf4j.LoggerFactory;
@@ -79,7 +78,6 @@
7978
import dev.dsf.fhir.validation.ResourceValidatorImpl;
8079
import dev.dsf.fhir.validation.ValidationSupportRule;
8180

82-
@Ignore
8381
public class TaskProfileTest
8482
{
8583
private static final Logger logger = LoggerFactory.getLogger(TaskProfileTest.class);

‎codex-process-data-transfer/src/test/resources/fhir/Bundle/SearchBundle.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<Bundle xmlns="http://hl7.org/fhir">
2+
<type value="batch"/>
3+
<entry>
4+
<request>
5+
<method value="GET"/>
6+
<url value="Patient?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-person/StructureDefinition/Patient"/>
7+
</request>
8+
</entry>
9+
<entry>
10+
<request>
11+
<method value="GET"/>
12+
<url value="Encounter?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-fall/StructureDefinition/KontaktGesundheitseinrichtung"/>
13+
</request>
14+
</entry>
15+
<entry>
16+
<request>
17+
<method value="GET"/>
18+
<url value="Observation?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-labor/StructureDefinition/ObservationLab"/>
19+
</request>
20+
</entry>
21+
<entry>
22+
<request>
23+
<method value="GET"/>
24+
<url value="MedicationAdministration?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/MedicationAdministration"/>
25+
</request>
26+
</entry>
27+
<entry>
28+
<request>
29+
<method value="GET"/>
30+
<url value="MedicationStatement?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-medikation/StructureDefinition/MedicationStatement"/>
31+
</request>
32+
</entry>
33+
<entry>
34+
<request>
35+
<method value="GET"/>
36+
<url value="Procedure?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-prozedur/StructureDefinition/Procedure"/>
37+
</request>
38+
</entry>
39+
<entry>
40+
<request>
41+
<method value="GET"/>
42+
<url value="Condition?_profile=https://www.medizininformatik-initiative.de/fhir/core/modul-diagnose/StructureDefinition/Diagnose"/>
43+
</request>
44+
</entry>
45+
46+
</Bundle>

0 commit comments

Comments
 (0)