From 5da1d22d021dbda69e3234371e6e72e30211b04b Mon Sep 17 00:00:00 2001 From: James Agnew Date: Wed, 28 Sep 2016 17:04:55 -0400 Subject: [PATCH] Docs --- .../uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java | 4 ++-- .../dstu3/hapi/validation/ResourceValidatorDstu3Test.java | 2 +- src/changes/changes.xml | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java index 4f2d88ac734..682eb562f7d 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/validation/FhirInstanceValidatorDstu3Test.java @@ -529,7 +529,7 @@ public class FhirInstanceValidatorDstu3Test { List 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 class FhirInstanceValidatorDstu3Test { List 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/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/validation/ResourceValidatorDstu3Test.java b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/validation/ResourceValidatorDstu3Test.java index fa4f7354678..952f3c79771 100644 --- a/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/validation/ResourceValidatorDstu3Test.java +++ b/hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/validation/ResourceValidatorDstu3Test.java @@ -78,7 +78,7 @@ public class ResourceValidatorDstu3Test { 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 index 14f8f6261cc..e122b4bc51a 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -110,6 +110,10 @@ CLI was not correctly able to upload DSTU2 examples to any server + + STU3 validator has been upgrated to include fixes made since the + 1.6.0 ballot +