From 5fba875d8b7bd2b5db478ee9f7a1a5b8823ff357 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Mon, 10 Aug 2020 21:57:55 -0400 Subject: [PATCH] Fix for failing ActivityDefinition-referralPrimaryCareMentalHealth.json test --- org.hl7.fhir.dstu3/pom.xml | 6 ++++++ .../java/org/hl7/fhir/dstu3/test/JsonParserTestCase.java | 2 +- .../hl7/fhir/utilities/tests/BaseTestingUtilities.java | 9 +++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 1e6813eee..c8ee0651e 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -116,6 +116,12 @@ ${junit_jupiter_version} test + + org.hl7.fhir.testcases + fhir-test-cases + ${validator_test_case_version} + test + diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/JsonParserTestCase.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/JsonParserTestCase.java index 16595c430..d640303ad 100644 --- a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/JsonParserTestCase.java +++ b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/JsonParserTestCase.java @@ -14,7 +14,7 @@ class JsonParserTestCase { @Test void test() throws FHIRFormatError, IOException { - Resource r = new JsonParser().parse(TestingUtilities.loadTestResourceStream("r3", "ActivityDefinition-referralPrimaryCareMentalHealth.json")); + Resource r = new JsonParser().parse(TestingUtilities.loadTestResourceStream("r3", "activitydefinition-referralprimarycarementalhealth.json")); } } diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java index 3467c71eb..1637c326e 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/tests/BaseTestingUtilities.java @@ -4,10 +4,9 @@ import org.apache.commons.io.IOUtils; import org.hl7.fhir.utilities.TextFile; import org.hl7.fhir.utilities.Utilities; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; +import java.util.ArrayList; +import java.util.List; public class BaseTestingUtilities { @@ -87,6 +86,4 @@ public class BaseTestingUtilities { } } } - - } \ No newline at end of file