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

Fix tests

This commit is contained in:
jamesagnew 2016-05-05 07:45:59 -04:00
parent 03e90b90c0
commit fb277a0595
2 changed files with 104 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/client/GenericJaxRsClientDstu3Test.java
View File

@ -2110,8 +2110,8 @@ public class GenericJaxRsClientDstu3Test {
assertEquals("http://localhost:" + ourPort + "/fhir/Patient/$validate", ourRequestUri);
assertEquals("POST", ourRequestMethod);
assertEquals("<Parameters xmlns=\"http://hl7.org/fhir\"><parameter><name value=\"resource\"/><resource><Patient xmlns=\"http://hl7.org/fhir\"><name><given value=\"GIVEN\"/></name></Patient></resource></parameter></Parameters>", ourRequestBodyString);
assertNotNull(response.getResource());
assertEquals("FOOBAR", toOo(response.getResource()).getIssue().get(0).getDiagnosticsElement().getValue());
assertNotNull(response.getOperationOutcome());
assertEquals("FOOBAR", ((OperationOutcome)response.getOperationOutcome()).getIssue().get(0).getDiagnosticsElement().getValue());
}

105
hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserDstu2Test.java
View File

@ -15,6 +15,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.io.IOException;
import java.lang.reflect.GenericDeclaration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
@ -380,7 +381,7 @@ public class JsonParserDstu2Test {
assertEquals("DISPLAY2", label.getDisplay());
assertEquals("VERSION2", label.getVersion());
}
@Test
public void testEncodeBundleNewBundleNoText() {
@ -402,7 +403,6 @@ public class JsonParserDstu2Test {
}
@Test
public void testEncodeBundleOldBundleNoText() {
@ -422,7 +422,6 @@ public class JsonParserDstu2Test {
}
/**
* Fixing #89
*/
@ -458,6 +457,7 @@ public class JsonParserDstu2Test {
assertEquals("{\"resourceType\":\"Binary\"}", output);
}
/**
* #158
*/
@ -474,6 +474,7 @@ public class JsonParserDstu2Test {
assertThat(encoded, not(containsString("tag")));
}
/**
* #158
*/
@ -1341,6 +1342,104 @@ public class JsonParserDstu2Test {
}
/**
* See #359 - This is the base test with no nulls, other testParseNullsFOO have nulls in them
*/
@Test
public void testParseNullsArray() {
//@formatter:off
String input =
"{\n" +
" \"resourceType\":\"Patient\",\n" +
" \"id\":\"123\",\n" +
" \"gender\":\"male\",\n" +
" \"name\":null\n" +
"}";
//@formatter:on
Patient patient = ourCtx.newJsonParser().parseResource(Patient.class, input);
assertEquals("Patient/123", patient.getId().getValue());
assertEquals(AdministrativeGenderEnum.MALE, patient.getGenderElement().getValueAsEnum());
assertEquals("", patient.getNameFirstRep().getFamilyAsSingleString());
}
/**
* See #359 - This is the base test with no nulls, other testParseNullsFOO have nulls in them
*/
@Test
public void testParseNullsNone() {
//@formatter:off
String input =
"{\n" +
" \"resourceType\":\"Patient\",\n" +
" \"id\":\"123\",\n" +
" \"gender\":\"male\",\n" +
" \"name\":[\n" +
" {\n" +
" \"family\":[\n" +
" \"FAMILY\"\n" +
" ]\n" +
" }\n" +
" ]\n" +
"}";
//@formatter:on
Patient patient = ourCtx.newJsonParser().parseResource(Patient.class, input);
assertEquals("Patient/123", patient.getId().getValue());
assertEquals(AdministrativeGenderEnum.MALE, patient.getGenderElement().getValueAsEnum());
assertEquals("FAMILY", patient.getNameFirstRep().getFamilyAsSingleString());
}
/**
* See #359 - This is the base test with no nulls, other testParseNullsFOO have nulls in them
*/
@Test
public void testParseNullsObject() {
//@formatter:off
String input =
"{\n" +
" \"resourceType\":\"Patient\",\n" +
" \"id\":\"123\",\n" +
" \"gender\":\"male\",\n" +
" \"name\":[\n" +
" null\n" +
" ]\n" +
"}";
//@formatter:on
Patient patient = ourCtx.newJsonParser().parseResource(Patient.class, input);
assertEquals("Patient/123", patient.getId().getValue());
assertEquals(AdministrativeGenderEnum.MALE, patient.getGenderElement().getValueAsEnum());
assertEquals("", patient.getNameFirstRep().getFamilyAsSingleString());
}
/**
* See #359 - Let's be lenient about nulls!
*/
@Test
public void testParseNullsPrimitive() {
//@formatter:off
String input =
"{\n" +
" \"resourceType\":\"Patient\",\n" +
" \"id\":null,\n" +
" \"gender\":null,\n" +
" \"name\":[\n" +
" {\n" +
" \"family\":[\n" +
" \"FAMILY\"\n" +
" ]\n" +
" }\n" +
" ]\n" +
"}";
//@formatter:on
Patient patient = ourCtx.newJsonParser().parseResource(Patient.class, input);
assertEquals(null, patient.getId().getValue());
assertEquals(null, patient.getGenderElement().getValueAsEnum());
assertEquals("FAMILY", patient.getNameFirstRep().getFamilyAsSingleString());
}
@Test
public void testParsePatientInBundle() {