diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 56c4811a6..f1e4ff603 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -6,3 +6,5 @@ ## Other code changes * rename ig-r4.json to ig-r4.jsonx in IGs +* move R5 package to test cases + diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java index ab2b0546b..2a10d3fb6 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java @@ -114,7 +114,13 @@ public class TestingUtilities extends BaseTestingUtilities { FilesystemPackageCacheManager pcm; try { pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION); - IWorkerContext fcontext = getWorkerContext(pcm.loadPackage(VersionUtilities.packageForVersion(version), version)); + IWorkerContext fcontext = null; + if (VersionUtilities.isR5Ver(version)) { + // for purposes of stability, the R5 core package comes from the test case repository + fcontext = getWorkerContext(loadR5CorePackage()); + } else { + fcontext = getWorkerContext(pcm.loadPackage(VersionUtilities.packageForVersion(version), version)); + } fcontext.setUcumService(new UcumEssenceService(TestingUtilities.loadTestResourceStream("ucum", "ucum-essence.xml"))); fcontext.setExpansionProfile(new Parameters()); if (!fcontext.hasPackage("hl7.terminology.r5", null)) { @@ -135,6 +141,10 @@ public class TestingUtilities extends BaseTestingUtilities { } } + private static NpmPackage loadR5CorePackage() throws IOException { + return NpmPackage.fromPackage(TestingUtilities.loadTestResourceStream("r5", "packages", "hl7.fhir.r5.core.tgz")); + } + public static String getTerminologyCacheDirectory() { return TestConfig.getInstance().getTxCacheDirectory("org.hl7.fhir.r5"); } diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ParsingTests.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ParsingTests.java index 5bfcff748..fdfc9803a 100644 --- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ParsingTests.java +++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ParsingTests.java @@ -36,7 +36,7 @@ public class ParsingTests { public static Stream data() throws ParserConfigurationException, IOException, FHIRFormatError, SAXException { FilesystemPackageCacheManager pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION); // npm = pcm.loadPackage("hl7.fhir.r5.examples", "5.0.0"); - npm = NpmPackage.fromPackage(TestingUtilities.loadTestResourceStream("r5", "hl7.fhir.r5.examples.tgz")); + npm = NpmPackage.fromPackage(TestingUtilities.loadTestResourceStream("r5", "packages", "hl7.fhir.r5.examples.tgz")); List objects = new ArrayList<>(); List names = npm.list("package"); for (String n : names) {