honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests to get versions consistent

This commit is contained in:
Grahame Grieve 2022-12-16 08:49:14 +11:00
parent 415d8acc12
commit 64cc3771a6
6 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/TestingUtilities.java
View File

@ -93,7 +93,10 @@ public class TestingUtilities extends BaseTestingUtilities {
* @return * @return
*/ */
public static IWorkerContext getSharedWorkerContext(String version) { public static IWorkerContext getSharedWorkerContext(String version) {
if (!Utilities.existsInList(version, "1.0.2", "3.0.1", "4.0.1", "4.3.0", "5.0.0")) {
throw new Error("illegal version: "+version);
}
String v = VersionUtilities.getMajMin(version); String v = VersionUtilities.getMajMin(version);
if (fcontexts == null) { if (fcontexts == null) {
@ -107,6 +110,7 @@ public class TestingUtilities extends BaseTestingUtilities {
} }
public static IWorkerContext getWorkerContext(String version) { public static IWorkerContext getWorkerContext(String version) {
FilesystemPackageCacheManager pcm; FilesystemPackageCacheManager pcm;
try { try {
pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION); pcm = new FilesystemPackageCacheManager(true, ToolsVersion.TOOLS_VERSION);

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

@ -178,7 +178,7 @@ public class NarrativeGenerationTests {
@BeforeAll @BeforeAll
public static void setUp() { public static void setUp() {
context = TestingUtilities.getSharedWorkerContext("5.0.0-ballot"); context = TestingUtilities.getSharedWorkerContext("5.0.0");
} }
@ParameterizedTest(name = "{index}: file {0}") @ParameterizedTest(name = "{index}: file {0}")

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

@ -115,7 +115,7 @@ public class VocabTests {
/* Do NOT get a shared worker context from Testing Utilities or else the terminology package loaded below /* Do NOT get a shared worker context from Testing Utilities or else the terminology package loaded below
will appear in tests where it causes failures. will appear in tests where it causes failures.
*/ */
context = TestingUtilities.getSharedWorkerContext(VersionUtilities.getMajMin(TestingUtilities.DEFAULT_CONTEXT_VERSION)); context = TestingUtilities.getSharedWorkerContext(TestingUtilities.DEFAULT_CONTEXT_VERSION);
} }

5
org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/iso4217.cache
View File

@ -17,3 +17,8 @@ e: {
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
} }
------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/currencies", "version": "5.0.0-snapshot3"}####
e: {
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
}
-------------------------------------------------------------------------------------

5
org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache
View File

@ -17,3 +17,8 @@ e: {
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
} }
------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/mimetypes", "version": "5.0.0-snapshot3"}####
e: {
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
}
-------------------------------------------------------------------------------------

10
org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache
View File

@ -119,3 +119,13 @@ e: {
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null" "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
} }
------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0-snapshot3"}####
e: {
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
}
-------------------------------------------------------------------------------------
{"hierarchical" : false, "url": "http://hl7.org/fhir/ValueSet/ucum-units", "version": "5.0.0-snapshot3"}####
e: {
"error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.TerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because \"this.txClient\" is null"
}
-------------------------------------------------------------------------------------