From 9758f32021dc5ea8cba2e5107e79b983bdefa6cb Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Sun, 21 Jun 2015 12:22:14 -0400 Subject: [PATCH] Fix build --- .../java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java | 8 ++++---- pom.xml | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java index 89b264637ec..9cee97ecc49 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java @@ -1078,7 +1078,7 @@ public class JsonParserHl7OrgTest { */ @Test public void testParseWithIncorrectReference() throws IOException { - String jsonString = IOUtils.toString(JsonParser.class.getResourceAsStream("/example-patient-general.json")); + String jsonString = IOUtils.toString(JsonParser.class.getResourceAsStream("/example-patient-general-hl7orgdstu2.json")); jsonString = jsonString.replace("\"reference\"", "\"resource\""); Patient parsed = ourCtx.newJsonParser().parseResource(Patient.class, jsonString); assertEquals("Organization/1", parsed.getManagingOrganization().getReference()); @@ -1087,7 +1087,7 @@ public class JsonParserHl7OrgTest { @Test public void testSimpleParse() throws DataFormatException, IOException { - String msg = IOUtils.toString(XmlParser.class.getResourceAsStream("/example-patient-general.json")); + String msg = IOUtils.toString(XmlParser.class.getResourceAsStream("/example-patient-general-hl7orgdstu2.json")); IParser p = ourCtx.newJsonParser(); // ourLog.info("Reading in message: {}", msg); Patient res = p.parseResource(Patient.class, msg); @@ -1104,7 +1104,7 @@ public class JsonParserHl7OrgTest { @Test public void testSimpleResourceEncode() throws IOException { - String xmlString = IOUtils.toString(JsonParser.class.getResourceAsStream("/example-patient-general.xml"), Charset.forName("UTF-8")); + String xmlString = IOUtils.toString(JsonParser.class.getResourceAsStream("/example-patient-general-hl7orgdstu2.xml"), Charset.forName("UTF-8")); Patient obs = ourCtx.newXmlParser().parseResource(Patient.class, xmlString); List undeclaredExtensions = obs.getContact().get(0).getName().getFamily().get(0).getExtension(); @@ -1117,7 +1117,7 @@ public class JsonParserHl7OrgTest { String encoded = jsonParser.encodeResourceToString(obs); ourLog.info(encoded); - String jsonString = IOUtils.toString(JsonParser.class.getResourceAsStream("/example-patient-general.json"), Charset.forName("UTF-8")); + String jsonString = IOUtils.toString(JsonParser.class.getResourceAsStream("/example-patient-general-hl7orgdstu2.json"), Charset.forName("UTF-8")); JSON expected = JSONSerializer.toJSON(jsonString); JSON actual = JSONSerializer.toJSON(encoded.trim()); diff --git a/pom.xml b/pom.xml index 8c6e7f6d372..5373c838f23 100644 --- a/pom.xml +++ b/pom.xml @@ -518,6 +518,9 @@ + + + @@ -893,6 +896,7 @@ hapi-fhir-structures-dstu2 hapi-fhir-structures-hl7org-dstu2 hapi-fhir-jpaserver-base + hapi-fhir-cobertura examples