honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-13 08:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with R4B FHIRPath tests

Browse Source
This commit is contained in:
Grahame Grieve 2022-10-07 09:20:34 +11:00
parent 56982e9732
commit 56e8774c8f
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
org.hl7.fhir.r4b/src/test/java/org/hl7/fhir/r4b/test/FHIRPathTests.java
View File

@ -175,19 +175,22 @@ public class FHIRPathTests {
} }
if (node != null) { if (node != null) {
if (!Utilities.noString(input)) {
res = resources.get(input);
if (res == null) {
if (input.endsWith(".json")) {
res = new JsonParser().parse(TestingUtilities.loadTestResourceStream("r4b", input));
} else {
res = new XmlParser().parse(TestingUtilities.loadTestResourceStream("r4b", input));
}
resources.put(input, res);
}
}
try { try {
if (Utilities.noString(input)) { if (Utilities.noString(input)) {
fp.check(null, null, node); fp.check(null, null, node);
} else { } else {
res = resources.get(input);
if (res == null) {
if (input.endsWith(".json")) {
res = new JsonParser().parse(TestingUtilities.loadTestResourceStream("r4b", input));
} else {
res = new XmlParser().parse(TestingUtilities.loadTestResourceStream("r4b", input));
}
resources.put(input, res);
}
fp.check(res, res.getResourceType().toString(), res.getResourceType().toString(), node); fp.check(res, res.getResourceType().toString(), res.getResourceType().toString(), node);
} }
Assertions.assertTrue(fail != TestResultType.SEMANTICS, String.format("Expected exception didn't occur checking %s", expression)); Assertions.assertTrue(fail != TestResultType.SEMANTICS, String.format("Expected exception didn't occur checking %s", expression));

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

@ -176,19 +176,22 @@ public class FHIRPathTests {
} }
if (node != null) { if (node != null) {
if (!Utilities.noString(input)) {
res = resources.get(input);
if (res == null) {
if (input.endsWith(".json")) {
res = new JsonParser().parse(TestingUtilities.loadTestResourceStream("r5", input));
} else {
res = new XmlParser().parse(TestingUtilities.loadTestResourceStream("r5", input));
}
resources.put(input, res);
}
}
try { try {
if (Utilities.noString(input)) { if (Utilities.noString(input)) {
fp.check(null, null, node); fp.check(null, null, node);
} else { } else {
res = resources.get(input);
if (res == null) {
if (input.endsWith(".json")) {
res = new JsonParser().parse(TestingUtilities.loadTestResourceStream("r5", input));
} else {
res = new XmlParser().parse(TestingUtilities.loadTestResourceStream("r5", input));
}
resources.put(input, res);
}
fp.check(res, res.getResourceType().toString(), res.getResourceType().toString(), node); fp.check(res, res.getResourceType().toString(), res.getResourceType().toString(), node);
} }
Assertions.assertTrue(fail != TestResultType.SEMANTICS, String.format("Expected exception didn't occur checking %s", expression)); Assertions.assertTrue(fail != TestResultType.SEMANTICS, String.format("Expected exception didn't occur checking %s", expression));

2
pom.xml
View File

@ -19,7 +19,7 @@
<properties> <properties>
<hapi_fhir_version>5.4.0</hapi_fhir_version> <hapi_fhir_version>5.4.0</hapi_fhir_version>
<validator_test_case_version>1.1.114</validator_test_case_version> <validator_test_case_version>1.1.115</validator_test_case_version>
<junit_jupiter_version>5.7.1</junit_jupiter_version> <junit_jupiter_version>5.7.1</junit_jupiter_version>
<junit_platform_launcher_version>1.8.2</junit_platform_launcher_version> <junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
<maven_surefire_version>3.0.0-M5</maven_surefire_version> <maven_surefire_version>3.0.0-M5</maven_surefire_version>