honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-06 19:39:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

try fixing narrative generation tests

Browse Source
This commit is contained in:
Grahame Grieve 2024-06-26 18:09:46 +10:00
parent 1439c97c91
commit b5539db606
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/CDARoundTripTests.java
View File

@ -26,7 +26,7 @@ public class CDARoundTripTests {
@BeforeAll @BeforeAll
public static void setUp() throws Exception { public static void setUp() throws Exception {
FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager.Builder().build(); FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager.Builder().build();
context = TestingUtilities.getWorkerContext(pcm.loadPackage("hl7.fhir.r4.core", "4.0.1")); context = new SimpleWorkerContext(TestingUtilities.getWorkerContext(pcm.loadPackage("hl7.fhir.r4.core", "4.0.1")));
fp = new FHIRPathEngine(context); fp = new FHIRPathEngine(context);
NpmPackage npm = new FilesystemPackageCacheManager.Builder().build().loadPackage("hl7.cda.uv.core", "current"); NpmPackage npm = new FilesystemPackageCacheManager.Builder().build().loadPackage("hl7.cda.uv.core", "current");

13
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/FHIRPathTests.java
View File

@ -11,6 +11,7 @@ import org.apache.commons.lang3.NotImplementedException;
import org.fhir.ucum.UcumException; import org.fhir.ucum.UcumException;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.exceptions.PathEngineException; import org.hl7.fhir.exceptions.PathEngineException;
import org.hl7.fhir.r5.context.SimpleWorkerContext;
import org.hl7.fhir.r5.elementmodel.Manager; import org.hl7.fhir.r5.elementmodel.Manager;
import org.hl7.fhir.r5.elementmodel.Manager.FhirFormat; import org.hl7.fhir.r5.elementmodel.Manager.FhirFormat;
import org.hl7.fhir.r5.fhirpath.ExpressionNode; import org.hl7.fhir.r5.fhirpath.ExpressionNode;
@ -95,7 +96,7 @@ public class FHIRPathTests {
@Override @Override
public ValueSet resolveValueSet(FHIRPathEngine engine, Object appContext, String url) { public ValueSet resolveValueSet(FHIRPathEngine engine, Object appContext, String url) {
return TestingUtilities.getSharedWorkerContext().fetchResource(ValueSet.class, url); return context.fetchResource(ValueSet.class, url);
} }
@Override @Override
@ -106,18 +107,20 @@ public class FHIRPathTests {
private static FHIRPathEngine fp; private static FHIRPathEngine fp;
private final Map<String, Base> resources = new HashMap<String, Base>(); private final Map<String, Base> resources = new HashMap<String, Base>();
private static SimpleWorkerContext context;
@BeforeAll @BeforeAll
public static void setUp() throws FileNotFoundException, FHIRException, IOException { public static void setUp() throws FileNotFoundException, FHIRException, IOException {
if (!TestingUtilities.getSharedWorkerContext().hasPackage("hl7.cda.us.ccda", null)) { context = new SimpleWorkerContext((SimpleWorkerContext) TestingUtilities.getSharedWorkerContext());
if (!context.hasPackage("hl7.cda.us.ccda", null)) {
FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager.Builder().build(); FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager.Builder().build();
NpmPackage npm = pcm.loadPackage("hl7.cda.uv.core", "2.0.0"); NpmPackage npm = pcm.loadPackage("hl7.cda.uv.core", "2.0.0");
TestingUtilities.getSharedWorkerContext().loadFromPackage(npm, null); context.loadFromPackage(npm, null);
npm = pcm.loadPackage("hl7.cda.us.ccda", "current"); npm = pcm.loadPackage("hl7.cda.us.ccda", "current");
TestingUtilities.getSharedWorkerContext().loadFromPackage(npm, null); context.loadFromPackage(npm, null);
} }
if (fp == null) { if (fp == null) {
fp = new FHIRPathEngine(TestingUtilities.getSharedWorkerContext()); fp = new FHIRPathEngine(context);
} }
} }