From 1d10470e9c91ac81de1b1fc9d1f231950eb269eb Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Mon, 5 Aug 2019 15:47:30 +1000
Subject: [PATCH] slicing by value set tests

---
 .gitignore                                    |  2 ++
 .../validation-examples/manifest.json         | 15 +++++++++++++--
 .../valueset-slicing-med-profile.xml          |  4 ++++
 .../valueset-slicing-meds-bad.xml             | 19 +++++++++++++++++++
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-meds-bad.xml

diff --git a/.gitignore b/.gitignore
index e0c1ed4bf..8d3be3ddf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -290,3 +290,5 @@ local.properties
 /org.hl7.fhir.r5/src/test/resources/snapshot-generation/dv1-actual.xml
 /org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-actual.xml
 /org.hl7.fhir.r4b
+/org.hl7.fhir.r5/src/test/resources/gen/gen.xml
+/org.hl7.fhir.r5/src/test/resources/graphql/*.out
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 0649bb898..bca906d91 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
@@ -854,9 +854,9 @@
 				"errorCount": 0,
 				"warningCount": 0
       },
-      "valueset-slicing-med.xml" : {
+      "valueset-slicing-meds.xml" : {
         "version" : "3.0",
-				"profiles": [
+				"codesystems": [
 					"valueset-slicing-med-cs.xml"
 				],
 				"errorCount": 0,
@@ -864,6 +864,17 @@
 					"source": "valueset-slicing-med-profile.xml",
 					"errorCount": 0
 				}
+      },
+      "valueset-slicing-meds-bad.xml" : {
+        "version" : "3.0",
+				"codesystems": [
+					"valueset-slicing-med-cs.xml"
+				],
+				"errorCount": 0,
+				"profile": {
+					"source": "valueset-slicing-med-profile.xml",
+					"errorCount": 1
+				}
       }
 		}
 	}
diff --git a/org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-med-profile.xml b/org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-med-profile.xml
index 3530e06b5..886beb1be 100644
--- a/org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-med-profile.xml
+++ b/org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-med-profile.xml
@@ -6,6 +6,7 @@
       <status value="draft"/>
       <compose>
         <include>
+          <system value="http://tst.org/fhir/CodeSystem/test-meds"/>
           <concept>
             <code value="s1"/>
           </concept>
@@ -22,6 +23,7 @@
       <status value="draft"/>
       <compose>
         <include>
+          <system value="http://tst.org/fhir/CodeSystem/test-meds"/>
           <concept>
             <code value="s2"/>
           </concept>
@@ -38,6 +40,7 @@
       <status value="draft"/>
       <compose>
         <include>
+          <system value="http://tst.org/fhir/CodeSystem/test-meds"/>
           <concept>
             <code value="s3"/>
           </concept>
@@ -54,6 +57,7 @@
       <status value="draft"/>
       <compose>
         <include>
+          <system value="http://tst.org/fhir/CodeSystem/test-meds"/>
           <concept>
             <code value="s4"/>
           </concept>
diff --git a/org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-meds-bad.xml b/org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-meds-bad.xml
new file mode 100644
index 000000000..ca6558925
--- /dev/null
+++ b/org.hl7.fhir.validation/src/test/resources/validation-examples/valueset-slicing-meds-bad.xml
@@ -0,0 +1,19 @@
+<Medication xmlns="http://hl7.org/fhir">
+  <code>
+    <coding>
+      <system value="http://tst.org/fhir/CodeSystem/test-meds"/>
+      <code value="s1"/>
+    </coding>
+    <coding>
+      <system value="http://tst.org/fhir/CodeSystem/test-meds"/>
+      <code value="s1"/>
+    </coding>
+    <coding>
+      <system value="http://tst.org/fhir/CodeSystem/test-meds"/>
+      <code value="s3"/>
+    </coding>
+    <text value="some text"/>
+  </code>
+  <status value="active"/>
+  <isBrand value="false"/>
+</Medication>