From 5bac79a9368f2c2afc87efd8a3150fda7647c5a8 Mon Sep 17 00:00:00 2001
From: Lloyd McKenzie <lmckenzie@gevityinc.com>
Date: Thu, 23 May 2019 13:33:34 -0600
Subject: [PATCH] Add test case for validator complaining about display names
 that are defined in the value set.

---
 .../resources/snapshot-generation-tests.xml   | 38 ++++++++++++++
 .../validation-examples/manifest.json         | 10 +++-
 .../patient-translated-codes.profile.xml      | 50 +++++++++++++++++++
 .../patient-translated-codes.xml              | 28 +++++++++++
 4 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.profile.xml
 create mode 100644 org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.xml

diff --git a/org.hl7.fhir.r5/src/main/resources/snapshot-generation-tests.xml b/org.hl7.fhir.r5/src/main/resources/snapshot-generation-tests.xml
index f72bf4db4..15a7a4a5e 100644
--- a/org.hl7.fhir.r5/src/main/resources/snapshot-generation-tests.xml
+++ b/org.hl7.fhir.r5/src/main/resources/snapshot-generation-tests.xml
@@ -1997,6 +1997,7 @@
         <label value="test1-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2065,6 +2066,7 @@
         <label value="test2-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2106,6 +2108,7 @@
         <label value="test3-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2156,6 +2159,7 @@
         <label value="test4-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2188,6 +2192,7 @@
         <label value="test5-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2229,6 +2234,7 @@
         <label value="test6-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2270,6 +2276,7 @@
         <label value="test7-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2302,6 +2309,7 @@
         <label value="test8-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2343,6 +2351,7 @@
         <label value="test9-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2384,6 +2393,7 @@
         <label value="test10-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2461,6 +2471,7 @@
         <label value="test11-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2547,6 +2558,7 @@
         <label value="test12-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2624,6 +2636,7 @@
         <label value="test12a-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2692,6 +2705,7 @@
         <label value="test13-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2907,6 +2921,7 @@
         <label value="test14-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2938,6 +2953,7 @@
         <label value="test15-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -2969,6 +2985,7 @@
         <label value="test16-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3000,6 +3017,7 @@
         <label value="test17-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3086,6 +3104,7 @@
         <label value="test18-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3172,6 +3191,7 @@
         <label value="test19-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3240,6 +3260,7 @@
         <label value="test20-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3317,6 +3338,7 @@
         <label value="test21-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3385,6 +3407,7 @@
         <label value="test22-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3417,6 +3440,7 @@
         <label value="test23-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3460,6 +3484,7 @@
         <label value="test24-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3499,6 +3524,7 @@
         <label value="test25-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3531,6 +3557,7 @@
         <label value="test26-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3562,6 +3589,7 @@
         <label value="test27-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3604,6 +3632,7 @@
         <label value="test28-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3637,6 +3666,7 @@
         <label value="test29-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3679,6 +3709,7 @@
         <label value="test30-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3712,6 +3743,7 @@
         <label value="test31-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3745,6 +3777,7 @@
         <label value="test32-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3778,6 +3811,7 @@
         <label value="test33-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3811,6 +3845,7 @@
         <label value="test34-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3853,6 +3888,7 @@
         <label value="test35-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3895,6 +3931,7 @@
         <label value="test36-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
@@ -3953,6 +3990,7 @@
         <label value="test38-0"/>
         <description value="Snapshot must generate ok"/>
         <response value="okay"/>
+        <warningOnly value="false"/>
       </assert>
     </action>
     <action>
diff --git a/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json b/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
index 774d3611f..822e9fbb6 100644
--- a/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
+++ b/org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
@@ -560,8 +560,16 @@
           "source" : "slicing-example-uk.profile.xml", 
           "errorCount": 16
         }
+      },
+       "patient-translated-codes.xml" : {
+        "errorCount": 0,
+        "warningCount": 4,
+        "profile" : {
+          "source" : "patient-translated-codes.profile.xml", 
+          "errorCount": 0,
+          "warningCount": 0
+        }
       }
-      
     }
 	}
 }
\ No newline at end of file
diff --git a/org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.profile.xml b/org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.profile.xml
new file mode 100644
index 000000000..97edee36e
--- /dev/null
+++ b/org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.profile.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<StructureDefinition xmlns="http://hl7.org/fhir">
+	<id value="patient-translated-codes"/>
+	<contained>
+    <ValueSet>
+      <id value="relationships"/>
+      <url value="http://hl7.org/fhir/patient-translated-codes-relationships"/>
+      <status value="draft"/>
+      <expansion>
+        <timestamp value="2019-05-23T10:18:03.2071-06:00"/>
+        <contains>
+          <system value="http://terminology.hl7.org/CodeSystem/v2-0131"/>
+          <code value="C"/>
+          <display value="alt-display"/>
+        </contains>
+        <contains>
+          <system value="http://terminology.hl7.org/CodeSystem/v2-0131"/>
+          <code value="N"/>
+          <designation>
+            <value value="alt-designation"/>
+          </designation>
+        </contains>
+      </expansion>
+    </ValueSet>
+  </contained>
+	<url value="http://hl7.org/fhir/StructureDefinition/patient-translated-codes"/>
+	<name value="PatientTranslatedCodes"/>
+	<title value="Test slicing by polymorphic type"/>
+	<status value="draft"/>
+	<kind value="resource"/>
+	<abstract value="false"/>
+	<type value="Patient"/>
+	<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Patient"/>
+	<derivation value="constraint"/>
+	<differential>
+		<element id="Patient">
+			<path value="Patient"/>
+		</element>
+		<element id="Patient.contact">
+			<path value="Patient.contact"/>
+		</element>
+		<element id="Patient.contact.relationship">
+			<path value="Patient.contact.relationship"/>
+			<binding>
+        <strength value="required"/>
+        <valueSet value="#relationships"/>
+      </binding>
+		</element>
+	</differential>
+</StructureDefinition>
diff --git a/org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.xml b/org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.xml
new file mode 100644
index 000000000..96b34bcb8
--- /dev/null
+++ b/org.hl7.fhir.validation/src/test/resources/validation-examples/patient-translated-codes.xml
@@ -0,0 +1,28 @@
+<Patient xmlns="http://hl7.org/fhir">
+	<id value="patient-error-gender"/>
+	<text>
+		<status value="generated"/>
+		<div xmlns="http://www.w3.org/1999/xhtml">
+		  Test alternate displays and designations for codes
+    </div>
+	</text>
+	<contact>
+    <relationship>
+      <coding>
+        <system value="http://terminology.hl7.org/CodeSystem/v2-0131"/>
+        <code value="C"/>
+        <display value="alt-display"/>
+      </coding>
+    </relationship>
+    <relationship>
+      <coding>
+        <system value="http://terminology.hl7.org/CodeSystem/v2-0131"/>
+        <code value="N"/>
+        <display value="alt-designation"/>
+      </coding>
+    </relationship>
+    <name>
+      <text value="Someone"/>
+    </name>
+	</contact>
+</Patient>