From 03e336a5cfde3b3be17df5a0beece46e82b030ea Mon Sep 17 00:00:00 2001 From: oliveregger Date: Tue, 27 Aug 2024 12:38:31 +0200 Subject: [PATCH] remove r4b #265 --- .../matchbox/engine/tests/FhirXVersTests.java | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/FhirXVersTests.java b/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/FhirXVersTests.java index 1683c8a1294..7c0f577e513 100644 --- a/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/FhirXVersTests.java +++ b/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/FhirXVersTests.java @@ -54,7 +54,7 @@ */ class FhirXVersTests { - static private MatchboxEngine engineR4B; +// static private MatchboxEngine engineR4B; static private MatchboxEngine engineR4, engineR5; private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(FhirMappingLanguageTests.class); @@ -62,22 +62,22 @@ class FhirXVersTests { @BeforeAll static void setUpBeforeClass() throws Exception { engineR4 = new MatchboxEngineBuilder().withXVersion(true).getEngineR4(); - engineR4B = new MatchboxEngineBuilder().withXVersion(true).getEngineR4B(); +// engineR4B = new MatchboxEngineBuilder().withXVersion(true).getEngineR4B(); engineR5 = new MatchboxEngineBuilder().withXVersion(true).getEngineR5(); // optional, just for peformance reason - engineR4.cacheXVersionEngine(engineR4B); +// engineR4.cacheXVersionEngine(engineR4B); engineR4.cacheXVersionEngine(engineR5); - engineR4B.cacheXVersionEngine(engineR4); - engineR4B.cacheXVersionEngine(engineR5); +// engineR4B.cacheXVersionEngine(engineR4); +// engineR4B.cacheXVersionEngine(engineR5); engineR5.cacheXVersionEngine(engineR4); - engineR5.cacheXVersionEngine(engineR4B); +// engineR5.cacheXVersionEngine(engineR4B); } @AfterAll static void teardownClass() throws Exception { engineR4 = null; engineR5 = null; - engineR4B = null; +// engineR4B = null; CompareUtil.logMemory(); } @@ -115,30 +115,30 @@ void testMedication5to4inR4() throws FHIRException, IOException { CompareUtil.logMemory(); } - @Test - void testMedication5to4inR4B() throws FHIRException, IOException { - MatchboxEngine engine = FhirXVersTests.engineR4B; - SimpleWorkerContext context = engine.getContext(); - assertEquals("4.3.0", engine.getVersion()); - assertEquals("4.3.0", engine.getContext().getVersion()); - assertNotNull(context.fetchResource(org.hl7.fhir.r5.model.Resource.class, - "http://hl7.org/fhir/StructureDefinition/Patient")); - assertNotNull(context.fetchResource(org.hl7.fhir.r5.model.Resource.class, - "http://hl7.org/fhir/uv/xver/StructureMap/Medication5to4")); - String result = engine.transform(getFileAsStringFromResources("/medication-r5-med0301.json"), true, - "http://hl7.org/fhir/uv/xver/StructureMap/Medication5to4", true); - log.info(result); - CompareUtil.compare(getFileAsStringFromResources("/medication-r4-med0301.json"), result, false); - } - - @Test - void testMedication5to4BinR4B() throws FHIRException, IOException { - MatchboxEngine engine = FhirXVersTests.engineR4B; - String result = engine.transform(getFileAsStringFromResources("/medication-r5-med0301.json"), true, - "http://hl7.org/fhir/uv/xver/StructureMap/Medication5to4b", true); - log.info(result); - CompareUtil.compare(getFileAsStringFromResources("/medication-r4b-med0301.json"), result, false); - } + // @Test + // void testMedication5to4inR4B() throws FHIRException, IOException { + // MatchboxEngine engine = FhirXVersTests.engineR4B; + // SimpleWorkerContext context = engine.getContext(); + // assertEquals("4.3.0", engine.getVersion()); + // assertEquals("4.3.0", engine.getContext().getVersion()); + // assertNotNull(context.fetchResource(org.hl7.fhir.r5.model.Resource.class, + // "http://hl7.org/fhir/StructureDefinition/Patient")); + // assertNotNull(context.fetchResource(org.hl7.fhir.r5.model.Resource.class, + // "http://hl7.org/fhir/uv/xver/StructureMap/Medication5to4")); + // String result = engine.transform(getFileAsStringFromResources("/medication-r5-med0301.json"), true, + // "http://hl7.org/fhir/uv/xver/StructureMap/Medication5to4", true); + // log.info(result); + // CompareUtil.compare(getFileAsStringFromResources("/medication-r4-med0301.json"), result, false); + // } + + // @Test + // void testMedication5to4BinR4B() throws FHIRException, IOException { + // MatchboxEngine engine = FhirXVersTests.engineR4B; + // String result = engine.transform(getFileAsStringFromResources("/medication-r5-med0301.json"), true, + // "http://hl7.org/fhir/uv/xver/StructureMap/Medication5to4b", true); + // log.info(result); + // CompareUtil.compare(getFileAsStringFromResources("/medication-r4b-med0301.json"), result, false); + // } @Test void testMedication5to4inR5() throws FHIRException, IOException { @@ -179,25 +179,25 @@ void testMedication4to5inR4() throws FHIRException, IOException { CompareUtil.logMemory(); } - @Test - void testMedication4to5inR4B() throws FHIRException, IOException { - MatchboxEngine engine = FhirXVersTests.engineR4B; - String result = engine.transform(getFileAsStringFromResources("/medication-r4-med0301.json"), - true, - "http://hl7.org/fhir/uv/xver/StructureMap/Medication4to5", true); - CompareUtil.compare(getFileAsStringFromResources("/medication-r5-med0301.json"), - result, false); - } - - @Test - void testMedication4Bto5inR4B() throws FHIRException, IOException { - MatchboxEngine engine = FhirXVersTests.engineR4B; - String result = engine.transform(getFileAsStringFromResources("/medication-r4b-med0301.json"), - true, - "http://hl7.org/fhir/uv/xver/StructureMap/Medication4Bto5", true); - CompareUtil.compare(getFileAsStringFromResources("/medication-r5-med0301.json"), - result, false); - } + // @Test + // void testMedication4to5inR4B() throws FHIRException, IOException { + // MatchboxEngine engine = FhirXVersTests.engineR4B; + // String result = engine.transform(getFileAsStringFromResources("/medication-r4-med0301.json"), + // true, + // "http://hl7.org/fhir/uv/xver/StructureMap/Medication4to5", true); + // CompareUtil.compare(getFileAsStringFromResources("/medication-r5-med0301.json"), + // result, false); + // } + + // @Test + // void testMedication4Bto5inR4B() throws FHIRException, IOException { + // MatchboxEngine engine = FhirXVersTests.engineR4B; + // String result = engine.transform(getFileAsStringFromResources("/medication-r4b-med0301.json"), + // true, + // "http://hl7.org/fhir/uv/xver/StructureMap/Medication4Bto5", true); + // CompareUtil.compare(getFileAsStringFromResources("/medication-r5-med0301.json"), + // result, false); + // } @Test void testMedication4to5inR5() throws FHIRException, IOException {