From d48800c05622f2036fabbbf073b3dd05aa1f89f5 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Wed, 23 Jan 2019 09:28:30 +1100
Subject: [PATCH] fix tests

---
 .../src/main/resources/snapshot-generation-tests.xml  |  2 +-
 .../org/hl7/fhir/r4/test/SnapShotGenerationTests.java | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/org.hl7.fhir.r4/src/main/resources/snapshot-generation-tests.xml b/org.hl7.fhir.r4/src/main/resources/snapshot-generation-tests.xml
index 15ad8434d..bd6f1b63f 100644
--- a/org.hl7.fhir.r4/src/main/resources/snapshot-generation-tests.xml
+++ b/org.hl7.fhir.r4/src/main/resources/snapshot-generation-tests.xml
@@ -2028,7 +2028,7 @@
         <label value="test4-1"/>
         <description value="The patient.identifier documentation must be right"/>
         <direction value="response"/>
-        <expression value="fixture('t4o').snapshot.element.where(path = 'Patient.identifier').doco.trace('doco') != '... some more doco'"/>
+        <expression value="fixture('t4o').snapshot.element.where(path = 'Patient.identifier').definition.trace('definition') != '... some more doco'"/>
         <warningOnly value="false"/>
       </assert>
     </action>
diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/SnapShotGenerationTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/SnapShotGenerationTests.java
index 1f7984b2b..c06f4ab77 100644
--- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/SnapShotGenerationTests.java
+++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/SnapShotGenerationTests.java
@@ -1,5 +1,6 @@
 package org.hl7.fhir.r4.test;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -311,6 +312,7 @@ public class SnapShotGenerationTests {
             StructureDefinition extd = TestingUtilities.context().fetchResource(StructureDefinition.class, sd.getBaseDefinition());
             new ProfileUtilities(TestingUtilities.context(), null, null).generateSnapshot(extd, sd, sd.getUrl(), sd.getName());
             TestingUtilities.context().cacheResource(sd);
+            debugSaveResource(sd);
           }
         }
       }
@@ -339,6 +341,7 @@ public class SnapShotGenerationTests {
               throw new FHIRException("Sort failed: "+errors.toString());
           }
           pu.generateSnapshot(base, output, source.getUrl(), source.getName());
+          debugSaveResource(output);
           context.fixtures.put(op.getResponseId(), output);
           context.snapshots.put(output.getUrl(), output);
           
@@ -378,6 +381,14 @@ public class SnapShotGenerationTests {
   }
 
 
+  private void debugSaveResource(Resource r) throws IOException {
+    String dir = System.getProperty("java.io.tmpdir");
+    if (new File("c:\\temp").exists())
+      dir = "c:\\temp";
+    String fn = Utilities.path(dir, r.fhirType()+"-"+r.getId()+".xml");
+    new XmlParser().setOutputStyle(OutputStyle.PRETTY).compose(new FileOutputStream(fn), r);
+  }
+
   private StructureDefinition getSD(String url) throws DefinitionException, FHIRException {
     StructureDefinition sd = context.snapshots.get(url);
     if (sd == null)