Get this test working (hapifhir#4)

aehrc · Jan 31, 2019 · 0c9fe20 · 0c9fe20
1 parent 742dac2
commit 0c9fe20
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 10 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,5 @@
+[*.java]
+charset = utf-8
+indent_style = space
+indent_size = 2
+
diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml
@@ -17,11 +17,11 @@
         <!-- HAPI Dependencies -->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>hapi-fhir-base</artifactId>
+            <artifactId>org.hl7.fhir.utilities</artifactId>
         </dependency>
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
-            <artifactId>org.hl7.fhir.utilities</artifactId>
+            <artifactId>hapi-fhir-base</artifactId>
         </dependency>
 
         <!-- UCUM -->

diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/SnapShotGenerationTests.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/SnapShotGenerationTests.java
@@ -13,6 +13,8 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.codec.Charsets;
+import org.apache.commons.io.IOUtils;
 import org.hl7.fhir.dstu3.conformance.ProfileUtilities;
 import org.hl7.fhir.dstu3.context.SimpleWorkerContext;
 import org.hl7.fhir.dstu3.formats.IParser.OutputStyle;
@@ -195,9 +197,10 @@ public Base resolveReference(Object appContext, String url) {
   private static FHIRPathEngine fp;
 
   @Parameters(name = "{index}: file {0}")
-  public static Iterable<Object[]> data() throws ParserConfigurationException, IOException, FHIRFormatError {
+  public static Iterable<Object[]> data() throws IOException, FHIRFormatError {
     SnapShotGenerationTestsContext context = new SnapShotGenerationTestsContext();
-    context.tests = (TestScript) new XmlParser().parse(new FileInputStream(Utilities.path(TestingUtilities.home(), "tests", "resources", "snapshot-generation-tests.xml")));
+    String contents = readFileFromClasspathAsString("snapshot-generation-tests.xml");
+    context.tests = (TestScript) new XmlParser().parse(contents);
 
     context.checkTestsDetails();
 
@@ -209,6 +212,10 @@ public static Iterable<Object[]> data() throws ParserConfigurationException, IOE
     return objects;
   }
 
+  private static String readFileFromClasspathAsString(String theClasspath) throws IOException {
+    return IOUtils.toString(SnapShotGenerationTests.class.getResourceAsStream(theClasspath), Charsets.UTF_8);
+  }
+
 
   private final TestScriptTestComponent test;
   private final String name;

diff --git a/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/support/TestingUtilities.java b/org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/test/support/TestingUtilities.java
@@ -43,6 +43,9 @@ public static String home() {
     String s = System.getenv("FHIR_HOME");
     if (!Utilities.noString(s))
       return s;
+    s = System.getProperty("FHIR_HOME");
+	  if (!Utilities.noString(s))
+		  return s;
     s = "C:\\work\\org.hl7.fhir\\build";
     if (new File(s).exists())
       return s;

diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml
@@ -15,14 +15,20 @@
 	<dependencies>
 
 		<!-- HAPI Dependencies -->
-		<dependency>
-         <groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-base</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>org.hl7.fhir.utilities</artifactId>
 		</dependency>
+		<dependency>
+         <groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-base</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>ca.uhn.hapi.fhir</groupId>
+					<artifactId>hapi-fhir-utilities</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
 		<!-- UCUM -->
 		<dependency>

diff --git a/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java b/org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/test/utils/TestingUtilities.java
@@ -66,6 +66,7 @@ public static IWorkerContext context() {
 	    PackageCacheManager pcm;
 	    try {
 	      pcm = new PackageCacheManager(true, ToolsVersion.TOOLS_VERSION);
+	      pcm.resolvePackage("hl7.fhir.core", "4.0.0", "4.0.1"); // FIXME: JA How to get the current version?
 	      fcontext = SimpleWorkerContext.fromPackage(pcm.loadPackageCache("hl7.fhir.core", "4.0.0"));
 	      fcontext.setUcumService(new UcumEssenceService(TestingUtilities.resourceNameToFile("ucum", "ucum-essence.xml")));
 	      fcontext.setExpansionProfile(new Parameters());

diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/PackageCacheManager.java
@@ -393,7 +393,8 @@ public long unPackage(InputStream tgz, List<PackageEntry> files) throws IOExcept
   private void analysePackage(String dir, String v, Map<String, String> profiles, Map<String, String> canonicals) throws IOException {
     int i = 0;
     int c = 11;
-    for (File f : new File(Utilities.path(dir, "package")).listFiles()) {
+    File[] packages = new File(Utilities.path(dir, "package")).listFiles();
+    for (File f : packages) {
       i++;
       if (progress && i % 20 == 0) {
         c++;

diff --git a/pom.xml b/pom.xml
@@ -74,11 +74,17 @@
 				<groupId>ca.uhn.hapi.fhir</groupId>
 				<artifactId>hapi-fhir-base</artifactId>
 				<version>${hapi_fhir_version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>ca.uhn.hapi.fhir</groupId>
+						<artifactId>hapi-fhir-utilities</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>ca.uhn.hapi.fhir</groupId>
 				<artifactId>org.hl7.fhir.utilities</artifactId>
-				<version>${hapi_fhir_version}</version>
+				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>ca.uhn.hapi.fhir</groupId>