Docs

hapifhir · Sep 28, 2016 · 5da1d22 · 5da1d22
1 parent 8a9a031
commit 5da1d22
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/...structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java b/...structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java
@@ -529,7 +529,7 @@ public void testValidateResourceContainingProfileDeclaration() {
 		List<SingleValidationMessage> errors = logResultsAndReturnNonInformationalOnes(output);
 
 		assertThat(errors.toString(), containsString("Element 'Observation.subject': minimum required = 1, but only found 0"));
-		assertThat(errors.toString(), containsString("Element encounter @ Observation: max allowed = 0, but found 1"));
+		assertThat(errors.toString(), containsString("Element 'Observation.encounter: max allowed = 0, but found 1"));
 		assertThat(errors.toString(), containsString("Element 'Observation.device': minimum required = 1, but only found 0"));
 		assertThat(errors.toString(), containsString(""));
 	}
@@ -689,7 +689,7 @@ public void testValidateResourceWithValuesetExpansionBad() {
 		List<SingleValidationMessage> all = logResultsAndReturnAll(output);
 		assertEquals(1, all.size());
 		assertEquals("Patient.identifier.type", all.get(0).getLocationString());
-		assertEquals("None of the codes provided are in the value set http://hl7.org/fhir/ValueSet/identifier-type (http://hl7.org/fhir/ValueSet/identifier-type, and a code should come from this value set unless it has no suitable code)", all.get(0).getMessage());
+		assertEquals("None of the codes provided are in the value set http://hl7.org/fhir/ValueSet/identifier-type (http://hl7.org/fhir/ValueSet/identifier-type, and a code should come from this value set unless it has no suitable code) (codes = http://example.com/foo/bar#bar)", all.get(0).getMessage());
 		assertEquals(ResultSeverityEnum.WARNING, all.get(0).getSeverity());
 
 	}

diff --git a/...es-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/validation/ResourceValidatorDstu3Test.java b/...es-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/validation/ResourceValidatorDstu3Test.java
@@ -78,7 +78,7 @@ public void testValidateResourceWithResourceElements() {
 
 		assertTrue(result.isSuccessful());
 
-		assertThat(ooencoded, containsString("No issues"));
+		assertThat(ooencoded, containsString("Unknown extension http://foo"));
 	}
 
 	/**

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -110,6 +110,10 @@
 			<action type="fix">
 				CLI was not correctly able to upload DSTU2 examples to any server
 			</action>
+			<action type="fix">
+				STU3 validator has been upgrated to include fixes made since the
+				1.6.0 ballot
+			</action>
 		</release>
 		<release version="2.0" date="2016-08-30">
 			<action type="fix">