From 78f9d6333a151f92a60d57aea96a0e7ee1032d39 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 17 May 2018 09:43:35 +0200 Subject: [PATCH] temp. fixed: "Attempt to read a single element when there is more than one present" #949 Will be overwritten by next RI import! --- .../ca/uhn/fhir/parser/XmlParserR4Test.java | 5 +---- .../FhirInstanceValidatorR4Test.java | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java index 908d8626a9b..11e35d05bf2 100644 --- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java +++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/XmlParserR4Test.java @@ -3,10 +3,7 @@ package ca.uhn.fhir.parser; import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.util.TestUtil; import com.google.common.collect.Sets; -import org.hl7.fhir.r4.model.Bundle; -import org.hl7.fhir.r4.model.Observation; -import org.hl7.fhir.r4.model.Patient; -import org.hl7.fhir.r4.model.Reference; +import org.hl7.fhir.r4.model.*; import org.junit.AfterClass; import org.junit.Test; import org.slf4j.Logger; diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java index f0405143199..cffa20b0534 100644 --- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java +++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/FhirInstanceValidatorR4Test.java @@ -191,7 +191,6 @@ public class FhirInstanceValidatorR4Test { retVal.add(next); } - return retVal; } @@ -1036,6 +1035,24 @@ public class FhirInstanceValidatorR4Test { } + @Test + public void testMultiplePerformer() { + Observation o = new Observation(); + Practitioner p1 = new Practitioner(); + Practitioner p2 = new Practitioner(); + + o.addPerformer(new Reference(p1)); + o.addPerformer(new Reference(p2)); + + ValidationResult output = myVal.validateWithResult(o); + List valMessages = logResultsAndReturnAll(output); + List messages = new ArrayList<>(); + for (String msg : messages) { + messages.add(msg); + } + assertThat(messages, not(hasItem("All observations should have a performer"))); + } + @Test public void testValidateResourceWithValuesetExpansionGood() { Patient patient = new Patient();