honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test fixes

This commit is contained in:
James Agnew 2019-07-11 21:10:30 -04:00
parent 1db019b6df
commit a352137938
3 changed files with 52 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java
View File

@ -851,7 +851,7 @@ public class JsonParser extends BaseParser implements IJsonLikeParser {
} }
private boolean isEncodeExtension(CompositeChildElement theParent, EncodeContext theEncodeContext, boolean theContainedResource, IBase theElement) { private boolean isEncodeExtension(CompositeChildElement theParent, EncodeContext theEncodeContext, boolean theContainedResource, IBase theElement) {
theEncodeContext.pushPath("extension", false); // theEncodeContext.pushPath("extension", false);
BaseRuntimeElementDefinition<?> runtimeElementDefinition = myContext.getElementDefinition(theElement.getClass()); BaseRuntimeElementDefinition<?> runtimeElementDefinition = myContext.getElementDefinition(theElement.getClass());
boolean retVal = true; boolean retVal = true;
if (runtimeElementDefinition instanceof BaseRuntimeElementCompositeDefinition) { if (runtimeElementDefinition instanceof BaseRuntimeElementCompositeDefinition) {
@ -859,8 +859,8 @@ public class JsonParser extends BaseParser implements IJsonLikeParser {
BaseRuntimeChildDefinition childDef = definition.getChildByName("extension"); BaseRuntimeChildDefinition childDef = definition.getChildByName("extension");
CompositeChildElement c = new CompositeChildElement(theParent, childDef, theEncodeContext); CompositeChildElement c = new CompositeChildElement(theParent, childDef, theEncodeContext);
retVal = c.shouldBeEncoded(theContainedResource); retVal = c.shouldBeEncoded(theContainedResource);
theEncodeContext.popPath();
} }
// theEncodeContext.popPath();
return retVal; return retVal;
} }
@ -1516,6 +1516,7 @@ public class JsonParser extends BaseParser implements IJsonLikeParser {
// Write value // Write value
if (!noValue) { if (!noValue) {
theEncodeContext.pushPath("value", false);
/* /*
* Pre-process value - This is called in case the value is a reference * Pre-process value - This is called in case the value is a reference
@ -1535,6 +1536,7 @@ public class JsonParser extends BaseParser implements IJsonLikeParser {
encodeChildElementToStreamWriter(theResDef, theResource, theEventWriter, value, childDef, childName, false, myParent,false, theEncodeContext); encodeChildElementToStreamWriter(theResDef, theResource, theEventWriter, value, childDef, childName, false, myParent,false, theEncodeContext);
managePrimitiveExtension(value, theResDef, theResource, theEventWriter, childDef, childName, theEncodeContext, theContainedResource); managePrimitiveExtension(value, theResDef, theResource, theEventWriter, childDef, childName, theEncodeContext, theContainedResource);
theEncodeContext.popPath();
} }
} }

126
hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/parser/JsonParserDstu3Test.java
View File

@ -18,9 +18,9 @@ import net.sf.json.JsonConfig;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.hamcrest.Matchers; import org.hamcrest.Matchers;
import org.hamcrest.core.StringContains; import org.hamcrest.core.StringContains;
import org.hl7.fhir.dstu3.model.*;
import org.hl7.fhir.dstu3.model.Address.AddressUse; import org.hl7.fhir.dstu3.model.Address.AddressUse;
import org.hl7.fhir.dstu3.model.Address.AddressUseEnumFactory; import org.hl7.fhir.dstu3.model.Address.AddressUseEnumFactory;
import org.hl7.fhir.dstu3.model.*;
import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent; import org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent;
import org.hl7.fhir.dstu3.model.Bundle.BundleType; import org.hl7.fhir.dstu3.model.Bundle.BundleType;
import org.hl7.fhir.dstu3.model.CapabilityStatement.UnknownContentCode; import org.hl7.fhir.dstu3.model.CapabilityStatement.UnknownContentCode;
@ -33,7 +33,6 @@ import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.utilities.xhtml.XhtmlNode; import org.hl7.fhir.utilities.xhtml.XhtmlNode;
import org.junit.*; import org.junit.*;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
@ -45,9 +44,8 @@ import static org.apache.commons.lang3.StringUtils.countMatches;
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.*; import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.mockito.Matchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Matchers.eq; import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.nullable; import static org.mockito.Mockito.nullable;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.*;
@ -110,16 +108,16 @@ public class JsonParserDstu3Test {
// Deserialize then check that valueReference value is still correct // Deserialize then check that valueReference value is still correct
fhirPat = parser.parseResource(Patient.class, output); fhirPat = parser.parseResource(Patient.class, output);
List<Extension> extlst = fhirPat.getExtensionsByUrl("x1"); List<Extension> extensions = fhirPat.getExtensionsByUrl("x1");
Assert.assertEquals(1, extlst.size()); Assert.assertEquals(1, extensions.size());
Assert.assertEquals(refVal, ((Reference) extlst.get(0).getValue()).getReference()); Assert.assertEquals(refVal, ((Reference) extensions.get(0).getValue()).getReference());
} }
/** /**
* See #544 * See #544
*/ */
@Test @Test
public void testBundleStitchReferencesByUuid() throws Exception { public void testBundleStitchReferencesByUuid() {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
DocumentManifest dm = new DocumentManifest(); DocumentManifest dm = new DocumentManifest();
@ -175,7 +173,7 @@ public class JsonParserDstu3Test {
} }
@Test @Test
public void testCustomUrlExtensioninBundle() { public void testCustomUrlExtensionInBundle() {
final String expected = "{\"resourceType\":\"Bundle\",\"entry\":[{\"resource\":{\"resourceType\":\"Patient\",\"extension\":[{\"url\":\"http://www.example.com/petname\",\"valueString\":\"myName\"}]}}]}"; final String expected = "{\"resourceType\":\"Bundle\",\"entry\":[{\"resource\":{\"resourceType\":\"Patient\",\"extension\":[{\"url\":\"http://www.example.com/petname\",\"valueString\":\"myName\"}]}}]}";
final MyPatientWithCustomUrlExtension patient = new MyPatientWithCustomUrlExtension(); final MyPatientWithCustomUrlExtension patient = new MyPatientWithCustomUrlExtension();
@ -213,7 +211,7 @@ public class JsonParserDstu3Test {
* See #276 * See #276
*/ */
@Test @Test
public void testDoubleEncodingContainedResources() throws Exception { public void testDoubleEncodingContainedResources() {
Patient patient = new Patient(); Patient patient = new Patient();
patient.setId("#patient-1"); patient.setId("#patient-1");
patient.setActive(true); patient.setActive(true);
@ -236,7 +234,7 @@ public class JsonParserDstu3Test {
} }
@Test @Test
public void testEncodeAndParseExtensions() throws Exception { public void testEncodeAndParseExtensions() {
Patient patient = new Patient(); Patient patient = new Patient();
patient.addIdentifier().setUse(IdentifierUse.OFFICIAL).setSystem("urn:example").setValue("7000135"); patient.addIdentifier().setUse(IdentifierUse.OFFICIAL).setSystem("urn:example").setValue("7000135");
@ -402,6 +400,7 @@ public class JsonParserDstu3Test {
/** /**
* See #336 * See #336
*/ */
@SuppressWarnings("SpellCheckingInspection")
@Test @Test
public void testEncodeAndParseNullPrimitiveWithExtensions() { public void testEncodeAndParseNullPrimitiveWithExtensions() {
@ -458,7 +457,7 @@ public class JsonParserDstu3Test {
Patient p = new Patient(); Patient p = new Patient();
p.addName().setFamily("FAMILY"); p.addName().setFamily("FAMILY");
List<Coding> labels = new ArrayList<Coding>(); List<Coding> labels = new ArrayList<>();
labels.add(new Coding().setSystem("SYSTEM1").setCode("CODE1").setDisplay("DISPLAY1").setVersion("VERSION1")); labels.add(new Coding().setSystem("SYSTEM1").setCode("CODE1").setDisplay("DISPLAY1").setVersion("VERSION1"));
labels.add(new Coding().setSystem("SYSTEM2").setCode("CODE2").setDisplay("DISPLAY2").setVersion("VERSION2")); labels.add(new Coding().setSystem("SYSTEM2").setCode("CODE2").setDisplay("DISPLAY2").setVersion("VERSION2"));
p.getMeta().getSecurity().addAll(labels); p.getMeta().getSecurity().addAll(labels);
@ -602,7 +601,7 @@ public class JsonParserDstu3Test {
*/ */
@Test @Test
public void testEncodeEmptyTag() { public void testEncodeEmptyTag() {
ArrayList<Coding> tagList = new ArrayList<Coding>(); ArrayList<Coding> tagList = new ArrayList<>();
tagList.add(new Coding()); tagList.add(new Coding());
tagList.add(new Coding().setDisplay("Label")); tagList.add(new Coding().setDisplay("Label"));
@ -618,7 +617,7 @@ public class JsonParserDstu3Test {
*/ */
@Test @Test
public void testEncodeEmptyTag2() { public void testEncodeEmptyTag2() {
ArrayList<Coding> tagList = new ArrayList<Coding>(); ArrayList<Coding> tagList = new ArrayList<>();
tagList.add(new Coding().setSystem("scheme").setCode("code")); tagList.add(new Coding().setSystem("scheme").setCode("code"));
tagList.add(new Coding().setDisplay("Label")); tagList.add(new Coding().setDisplay("Label"));
@ -731,8 +730,8 @@ public class JsonParserDstu3Test {
encoded = parser.encodeResourceToString(p); encoded = parser.encodeResourceToString(p);
ourLog.info(encoded); ourLog.info(encoded);
assertThat(encoded, (containsString("http://foo"))); assertThat(encoded, not(containsString("http://foo")));
assertThat(encoded, (containsString("Practitioner/A"))); assertThat(encoded, not(containsString("Practitioner/A")));
} }
@ -831,7 +830,7 @@ public class JsonParserDstu3Test {
TestPatientFor327 patient = new TestPatientFor327(); TestPatientFor327 patient = new TestPatientFor327();
patient.setBirthDateElement(new DateType("2016-04-14")); patient.setBirthDateElement(new DateType("2016-04-14"));
List<Reference> conditions = new ArrayList<Reference>(); List<Reference> conditions = new ArrayList<>();
Condition condition = new Condition(); Condition condition = new Condition();
condition.addBodySite().setText("BODY SITE"); condition.addBodySite().setText("BODY SITE");
conditions.add(new Reference(condition)); conditions.add(new Reference(condition));
@ -909,7 +908,7 @@ public class JsonParserDstu3Test {
ourLog.info(enc); ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\"")); assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\""));
parser.setDontStripVersionsFromReferencesAtPaths(new ArrayList<String>()); parser.setDontStripVersionsFromReferencesAtPaths(new ArrayList<>());
enc = parser.setPrettyPrint(true).encodeResourceToString(auditEvent); enc = parser.setPrettyPrint(true).encodeResourceToString(auditEvent);
ourLog.info(enc); ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2\"")); assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2\""));
@ -943,12 +942,12 @@ public class JsonParserDstu3Test {
ourLog.info(enc); ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\"")); assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\""));
ourCtx.getParserOptions().setDontStripVersionsFromReferencesAtPaths(Arrays.asList("Patient.managingOrganization")); ourCtx.getParserOptions().setDontStripVersionsFromReferencesAtPaths(Collections.singletonList("Patient.managingOrganization"));
enc = parser.setPrettyPrint(true).encodeResourceToString(p); enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc); ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\"")); assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\""));
ourCtx.getParserOptions().setDontStripVersionsFromReferencesAtPaths(new HashSet<String>(Arrays.asList("Patient.managingOrganization"))); ourCtx.getParserOptions().setDontStripVersionsFromReferencesAtPaths(new HashSet<>(Collections.singletonList("Patient.managingOrganization")));
enc = parser.setPrettyPrint(true).encodeResourceToString(p); enc = parser.setPrettyPrint(true).encodeResourceToString(p);
ourLog.info(enc); ourLog.info(enc);
assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\"")); assertThat(enc, containsString("\"reference\": \"http://foo.com/Organization/2/_history/1\""));
@ -1026,7 +1025,7 @@ public class JsonParserDstu3Test {
} }
@Test @Test
public void testEncodeNarrativeSuppressed() throws Exception { public void testEncodeNarrativeSuppressed() {
Patient patient = new Patient(); Patient patient = new Patient();
patient.setId("Patient/1/_history/1"); patient.setId("Patient/1/_history/1");
patient.getText().setDivAsString("<div>THE DIV</div>"); patient.getText().setDivAsString("<div>THE DIV</div>");
@ -1171,7 +1170,7 @@ public class JsonParserDstu3Test {
* See #241 * See #241
*/ */
@Test @Test
public void testEncodeThenParseShouldNotAddSpuriousId() throws Exception { public void testEncodeThenParseShouldNotAddSpuriousId() {
Condition condition = new Condition().setVerificationStatus(ConditionVerificationStatus.CONFIRMED); Condition condition = new Condition().setVerificationStatus(ConditionVerificationStatus.CONFIRMED);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
BundleEntryComponent entry = new Bundle.BundleEntryComponent(); BundleEntryComponent entry = new Bundle.BundleEntryComponent();
@ -1190,7 +1189,7 @@ public class JsonParserDstu3Test {
} }
@Test @Test
public void testEncodeUndeclaredBlock() throws Exception { public void testEncodeUndeclaredBlock() {
FooMessageHeader.FooMessageSourceComponent source = new FooMessageHeader.FooMessageSourceComponent(); FooMessageHeader.FooMessageSourceComponent source = new FooMessageHeader.FooMessageSourceComponent();
source.getMessageHeaderApplicationId().setValue("APPID"); source.getMessageHeaderApplicationId().setValue("APPID");
source.setName("NAME"); source.setName("NAME");
@ -1217,7 +1216,7 @@ public class JsonParserDstu3Test {
Patient patient = new Patient(); Patient patient = new Patient();
patient.addAddress().setUse(AddressUse.HOME); patient.addAddress().setUse(AddressUse.HOME);
EnumFactory<AddressUse> fact = new AddressUseEnumFactory(); EnumFactory<AddressUse> fact = new AddressUseEnumFactory();
PrimitiveType<AddressUse> enumeration = new Enumeration<AddressUse>(fact).setValue(AddressUse.HOME); PrimitiveType<AddressUse> enumeration = new Enumeration<>(fact).setValue(AddressUse.HOME);
patient.addExtension().setUrl("urn:foo").setValue(enumeration); patient.addExtension().setUrl("urn:foo").setValue(enumeration);
String val = parser.encodeResourceToString(patient); String val = parser.encodeResourceToString(patient);
@ -1232,7 +1231,7 @@ public class JsonParserDstu3Test {
} }
@Test @Test
public void testEncodeWithDontEncodeElements() throws Exception { public void testEncodeWithDontEncodeElements() {
Patient patient = new Patient(); Patient patient = new Patient();
patient.setId("123"); patient.setId("123");
@ -1288,7 +1287,7 @@ public class JsonParserDstu3Test {
{ {
IParser p = ourCtx.newJsonParser(); IParser p = ourCtx.newJsonParser();
p.setDontEncodeElements(Sets.newHashSet("Patient.meta")); p.setDontEncodeElements(Sets.newHashSet("Patient.meta"));
p.setEncodeElements(new HashSet<String>(Arrays.asList("Patient.name"))); p.setEncodeElements(new HashSet<>(Collections.singletonList("Patient.name")));
p.setPrettyPrint(true); p.setPrettyPrint(true);
String out = p.encodeResourceToString(patient); String out = p.encodeResourceToString(patient);
ourLog.info(out); ourLog.info(out);
@ -1502,7 +1501,7 @@ public class JsonParserDstu3Test {
String res = "{ \"resourceType\": \"ValueSet\", \"url\": \"http://sample/ValueSet/education-levels\", \"version\": \"1\", \"name\": \"Education Levels\", \"status\": \"draft\", \"compose\": { \"include\": [ { \"filter\": [ { \"property\": \"n\", \"op\": \"n\", \"value\": \"365460000\" } ], \"system\": \"http://snomed.info/sct\" } ], \"exclude\": [ { \"concept\": [ { \"code\": \"224298008\" }, { \"code\": \"365460000\" }, { \"code\": \"473462005\" }, { \"code\": \"424587006\" } ], \"system\": \"http://snomed.info/sct\" } ] }, \"description\": \"A selection of Education Levels\", \"text\": { \"status\": \"generated\", \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\"><h2>Education Levels</h2><tt>http://csiro.au/ValueSet/education-levels</tt><p>A selection of Education Levels</p></div>\" }, \"experimental\": true, \"date\": \"2016-07-26\" }"; String res = "{ \"resourceType\": \"ValueSet\", \"url\": \"http://sample/ValueSet/education-levels\", \"version\": \"1\", \"name\": \"Education Levels\", \"status\": \"draft\", \"compose\": { \"include\": [ { \"filter\": [ { \"property\": \"n\", \"op\": \"n\", \"value\": \"365460000\" } ], \"system\": \"http://snomed.info/sct\" } ], \"exclude\": [ { \"concept\": [ { \"code\": \"224298008\" }, { \"code\": \"365460000\" }, { \"code\": \"473462005\" }, { \"code\": \"424587006\" } ], \"system\": \"http://snomed.info/sct\" } ] }, \"description\": \"A selection of Education Levels\", \"text\": { \"status\": \"generated\", \"div\": \"<div xmlns=\\\"http://www.w3.org/1999/xhtml\\\"><h2>Education Levels</h2><tt>http://csiro.au/ValueSet/education-levels</tt><p>A selection of Education Levels</p></div>\" }, \"experimental\": true, \"date\": \"2016-07-26\" }";
IParser parser = ourCtx.newJsonParser(); IParser parser = ourCtx.newJsonParser();
parser.setParserErrorHandler(new StrictErrorHandler()); parser.setParserErrorHandler(new StrictErrorHandler());
ValueSet parsed = parser.parseResource(ValueSet.class, res); parser.parseResource(ValueSet.class, res);
fail("DataFormat Invalid attribute exception should be thrown"); fail("DataFormat Invalid attribute exception should be thrown");
} }
@ -1735,53 +1734,6 @@ public class JsonParserDstu3Test {
assertThat(reencoded, containsString("contained")); assertThat(reencoded, containsString("contained"));
} }
@Test
@Ignore
public void testParseAndEncodeBundleNewStyle() throws Exception {
String content = IOUtils.toString(JsonParserDstu3Test.class.getResourceAsStream("/bundle-example.json"), StandardCharsets.UTF_8);
Bundle parsed = ourCtx.newJsonParser().parseResource(Bundle.class, content);
assertEquals("Bundle/example/_history/1", parsed.getIdElement().getValue());
assertEquals("1", parsed.getIdElement().getVersionIdPart());
assertEquals("2014-08-18T01:43:30Z", parsed.getMeta().getLastUpdatedElement().getValueAsString());
assertEquals("searchset", parsed.getType());
assertEquals(3, parsed.getTotal());
assertEquals("https://example.com/base/MedicationRequest?patient=347&searchId=ff15fd40-ff71-4b48-b366-09c706bed9d0&page=2", parsed.getLink().get(0).getUrlElement().getValueAsString());
assertEquals("https://example.com/base/MedicationRequest?patient=347&_include=MedicationRequest.medication", parsed.getLink().get(1).getUrlElement().getValueAsString());
assertEquals(2, parsed.getEntry().size());
assertEquals("alternate", parsed.getEntry().get(0).getLink().get(0).getRelation());
assertEquals("http://example.com/base/MedicationRequest/3123/_history/1", parsed.getEntry().get(0).getLink().get(0).getUrl());
assertEquals("http://foo?search", parsed.getEntry().get(0).getRequest().getUrlElement().getValueAsString());
MedicationRequest p = (MedicationRequest) parsed.getEntry().get(0).getResource();
assertEquals("Patient/347", p.getSubject().getReference());
assertEquals("2014-08-16T05:31:17Z", p.getMeta().getLastUpdatedElement().getValueAsString());
assertEquals("http://example.com/base/MedicationRequest/3123/_history/1", p.getId());
// assertEquals("3123", p.getId());
Medication m = (Medication) parsed.getEntry().get(1).getResource();
assertEquals("http://example.com/base/Medication/example", m.getId());
assertSame(((Reference) p.getMedication()).getResource(), m);
String reencoded = ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(parsed);
ourLog.info(reencoded);
JsonConfig cfg = new JsonConfig();
JSON expected = JSONSerializer.toJSON(content.trim(), cfg);
JSON actual = JSONSerializer.toJSON(reencoded.trim(), cfg);
String exp = expected.toString().replace("\\r\\n", "\\n"); // .replace("&sect;", "§");
String act = actual.toString().replace("\\r\\n", "\\n");
ourLog.info("Expected: {}", exp);
ourLog.info("Actual : {}", act);
assertEquals(exp, act);
}
@Test @Test
public void testParseAndEncodeBundleWithUuidBase() { public void testParseAndEncodeBundleWithUuidBase() {
//@formatter:off //@formatter:off
@ -2285,20 +2237,18 @@ public class JsonParserDstu3Test {
@Test(expected = DataFormatException.class) @Test(expected = DataFormatException.class)
public void testParseWithTrailingContent() { public void testParseWithTrailingContent() {
//@formatter:off
String bundle = "{\n" + String bundle = "{\n" +
" \"resourceType\" : \"Bundle\",\n" + " \"resourceType\" : \"Bundle\",\n" +
" \"total\" : 1\n" + " \"total\" : 1\n" +
"}}"; "}}";
//@formatter:on
Bundle b = ourCtx.newJsonParser().parseResource(Bundle.class, bundle); ourCtx.newJsonParser().parseResource(Bundle.class, bundle);
} }
@Test @Test
@Ignore @Ignore
public void testParseWithWrongTypeObjectShouldBeArray() throws Exception { public void testParseWithWrongTypeObjectShouldBeArray() throws Exception {
String input = IOUtils.toString(getClass().getResourceAsStream("/invalid_metadata.json")); String input = IOUtils.toString(getClass().getResourceAsStream("/invalid_metadata.json"), Charsets.UTF_8);
try { try {
ourCtx.newJsonParser().parseResource(CapabilityStatement.class, input); ourCtx.newJsonParser().parseResource(CapabilityStatement.class, input);
fail(); fail();
@ -2410,14 +2360,14 @@ public class JsonParserDstu3Test {
ArgumentCaptor<ValueType> actual = ArgumentCaptor.forClass(ValueType.class); ArgumentCaptor<ValueType> actual = ArgumentCaptor.forClass(ValueType.class);
ArgumentCaptor<ScalarType> expectedScalar = ArgumentCaptor.forClass(ScalarType.class); ArgumentCaptor<ScalarType> expectedScalar = ArgumentCaptor.forClass(ScalarType.class);
ArgumentCaptor<ScalarType> actualScalar = ArgumentCaptor.forClass(ScalarType.class); ArgumentCaptor<ScalarType> actualScalar = ArgumentCaptor.forClass(ScalarType.class);
verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.nullable(IParseLocation.class), elementName.capture(), expected.capture(), expectedScalar.capture(), actual.capture(), verify(errorHandler, atLeastOnce()).incorrectJsonType(nullable(IParseLocation.class), elementName.capture(), expected.capture(), expectedScalar.capture(), actual.capture(),
actualScalar.capture()); actualScalar.capture());
verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.nullable(IParseLocation.class), Mockito.eq("_id"), Mockito.eq(ValueType.OBJECT), expectedScalar.capture(), Mockito.eq(ValueType.SCALAR), verify(errorHandler, atLeastOnce()).incorrectJsonType(nullable(IParseLocation.class), eq("_id"), eq(ValueType.OBJECT), expectedScalar.capture(), eq(ValueType.SCALAR),
actualScalar.capture()); actualScalar.capture());
verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.nullable(IParseLocation.class), Mockito.eq("__v"), Mockito.eq(ValueType.OBJECT), expectedScalar.capture(), Mockito.eq(ValueType.SCALAR), verify(errorHandler, atLeastOnce()).incorrectJsonType(nullable(IParseLocation.class), eq("__v"), eq(ValueType.OBJECT), expectedScalar.capture(), eq(ValueType.SCALAR),
actualScalar.capture()); actualScalar.capture());
verify(errorHandler, atLeastOnce()).incorrectJsonType(Mockito.nullable(IParseLocation.class), Mockito.eq("_status"), Mockito.eq(ValueType.OBJECT), expectedScalar.capture(), verify(errorHandler, atLeastOnce()).incorrectJsonType(nullable(IParseLocation.class), eq("_status"), eq(ValueType.OBJECT), expectedScalar.capture(),
Mockito.eq(ValueType.SCALAR), actualScalar.capture()); eq(ValueType.SCALAR), actualScalar.capture());
assertEquals("_id", elementName.getAllValues().get(0)); assertEquals("_id", elementName.getAllValues().get(0));
assertEquals(ValueType.OBJECT, expected.getAllValues().get(0)); assertEquals(ValueType.OBJECT, expected.getAllValues().get(0));
@ -2427,7 +2377,7 @@ public class JsonParserDstu3Test {
} }
@Test @Test
public void testValidateCustomStructure() throws Exception { public void testValidateCustomStructure() {
FooMessageHeader.FooMessageSourceComponent source = new FooMessageHeader.FooMessageSourceComponent(); FooMessageHeader.FooMessageSourceComponent source = new FooMessageHeader.FooMessageSourceComponent();
source.getMessageHeaderApplicationId().setValue("APPID"); source.getMessageHeaderApplicationId().setValue("APPID");
@ -2456,13 +2406,13 @@ public class JsonParserDstu3Test {
containedOrganization.getMeta().addProfile(UUID.randomUUID().toString()); containedOrganization.getMeta().addProfile(UUID.randomUUID().toString());
containedOrganization.getMeta().setLastUpdated(new Date()); containedOrganization.getMeta().setLastUpdated(new Date());
containedOrganization.getMeta().setVersionId(UUID.randomUUID().toString()); containedOrganization.getMeta().setVersionId(UUID.randomUUID().toString());
containedOrganization.getMeta().setSecurity(Arrays.asList(new Coding(UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString()))); containedOrganization.getMeta().setSecurity(Collections.singletonList(new Coding(UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString())));
containedOrganization.getMeta().setTag(Arrays.asList(new Coding(UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString()))); containedOrganization.getMeta().setTag(Collections.singletonList(new Coding(UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString())));
Patient patient = new Patient(); Patient patient = new Patient();
patient.setId(UUID.randomUUID().toString()); patient.setId(UUID.randomUUID().toString());
patient.getMeta().addProfile(UUID.randomUUID().toString()); patient.getMeta().addProfile(UUID.randomUUID().toString());
patient.setGeneralPractitioner(Arrays.asList(new Reference(containedOrganization))); patient.setGeneralPractitioner(Collections.singletonList(new Reference(containedOrganization)));
HashSet<String> excludeElementsInEncoded = new HashSet<>(); // ResourceMetaParams.EXCLUDE_ELEMENTS_IN_ENCODED HashSet<String> excludeElementsInEncoded = new HashSet<>(); // ResourceMetaParams.EXCLUDE_ELEMENTS_IN_ENCODED
excludeElementsInEncoded.add("id"); excludeElementsInEncoded.add("id");

10
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/ElementsParamR4Test.java
View File

@ -264,6 +264,16 @@ public class ElementsParamR4Test {
assertEquals("mg", ((Quantity) procedure.getExtension().get(0).getValue()).getCode()); assertEquals("mg", ((Quantity) procedure.getExtension().get(0).getValue()).getCode());
}); });
verifyXmlAndJson(
"http://localhost:" + ourPort + "/Procedure?_elements=Procedure.extension.value",
bundle -> {
Procedure procedure = (Procedure) bundle.getEntry().get(0).getResource();
assertEquals("SUBSETTED", procedure.getMeta().getTag().get(0).getCode());
assertEquals(0, procedure.getReasonCode().size());
assertEquals("1.1", ((Quantity) procedure.getExtension().get(0).getValue()).getValueElement().getValueAsString());
assertEquals("mg", ((Quantity) procedure.getExtension().get(0).getValue()).getCode());
});
verifyXmlAndJson( verifyXmlAndJson(
"http://localhost:" + ourPort + "/Procedure?_elements=Procedure.extension.value.value", "http://localhost:" + ourPort + "/Procedure?_elements=Procedure.extension.value.value",
bundle -> { bundle -> {