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

Fix test regression

This commit is contained in:
James Agnew 2016-07-05 17:30:14 -04:00
parent d63e289cbe
commit 74feb38085
1 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
hapi-fhir-structures-dstu3/src/test/java/ca/uhn/fhir/rest/server/ValidateDstu3Test.java
View File

@ -43,14 +43,16 @@ public class ValidateDstu3Test {
private static CloseableHttpClient ourClient;
private static FhirContext ourCtx = FhirContext.forDstu3();
private static EncodingEnum ourLastEncoding;
private static IdType ourLastId;
private static ValidationModeEnum ourLastMode;
public static Patient ourLastPatient;
private static String ourLastProfile;
private static String ourLastResourceBody;
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ValidateDstu3Test.class);
private static OperationOutcome ourOutcomeToReturn;
private static int ourPort;
private static Server ourServer;
public static Patient ourLastPatient;
private static IdType ourLastId;
@Before()
public void before() {
@ -83,6 +85,27 @@ public class ValidateDstu3Test {
assertThat(resp, stringContainsInOrder("<OperationOutcome"));
}
@Test
public void testValidateBlankMode() throws Exception {
Patient patient = new Patient();
patient.addIdentifier().setValue("001");
patient.addIdentifier().setValue("002");
Parameters params = new Parameters();
params.addParameter().setName("resource").setResource(patient);
params.addParameter().setName("mode").setValue(new CodeType(" "));
HttpPost httpPost = new HttpPost("http://localhost:" + ourPort + "/Patient/$validate");
httpPost.setEntity(new StringEntity(ourCtx.newXmlParser().encodeResourceToString(params), ContentType.create(Constants.CT_FHIR_XML, "UTF-8")));
HttpResponse status = ourClient.execute(httpPost);
String resp = IOUtils.toString(status.getEntity().getContent());
IOUtils.closeQuietly(status.getEntity().getContent());
assertEquals(200, status.getStatusLine().getStatusCode());
}
@Test
public void testValidateInvalidMode() throws Exception {
@ -106,27 +129,6 @@ public class ValidateDstu3Test {
assertThat(resp, stringContainsInOrder("Invalid mode value: &quot;AAA&quot;"));
}
@Test
public void testValidateBlankMode() throws Exception {
Patient patient = new Patient();
patient.addIdentifier().setValue("001");
patient.addIdentifier().setValue("002");
Parameters params = new Parameters();
params.addParameter().setName("resource").setResource(patient);
params.addParameter().setName("mode").setValue(new CodeType(" "));
HttpPost httpPost = new HttpPost("http://localhost:" + ourPort + "/Patient/$validate");
httpPost.setEntity(new StringEntity(ourCtx.newXmlParser().encodeResourceToString(params), ContentType.create(Constants.CT_FHIR_XML, "UTF-8")));
HttpResponse status = ourClient.execute(httpPost);
String resp = IOUtils.toString(status.getEntity().getContent());
IOUtils.closeQuietly(status.getEntity().getContent());
assertEquals(200, status.getStatusLine().getStatusCode());
}
@Test
public void testValidateMissingResource() throws Exception {
@ -148,6 +150,25 @@ public class ValidateDstu3Test {
assertEquals(200, status.getStatusLine().getStatusCode());
}
@Test
public void testValidateWithGet() throws Exception {
ourOutcomeToReturn = new OperationOutcome();
ourOutcomeToReturn.addIssue().setDiagnostics("FOOBAR");
HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/123/$validate");
HttpResponse status = ourClient.execute(httpGet);
String resp = IOUtils.toString(status.getEntity().getContent());
IOUtils.closeQuietly(status.getEntity().getContent());
assertEquals(200, status.getStatusLine().getStatusCode());
assertThat(resp, stringContainsInOrder("<OperationOutcome", "FOOBAR"));
assertEquals(null, ourLastPatient);
assertEquals("Patient", ourLastId.getResourceType());
assertEquals("123", ourLastId.getIdPart());
}
@Test
public void testValidateWithNoParsed() throws Exception {
@ -186,6 +207,7 @@ public class ValidateDstu3Test {
HttpResponse status = ourClient.execute(httpPost);
String resp = IOUtils.toString(status.getEntity().getContent());
ourLog.info(resp);
IOUtils.closeQuietly(status.getEntity().getContent());
assertEquals(200, status.getStatusLine().getStatusCode());
@ -220,25 +242,6 @@ public class ValidateDstu3Test {
assertThat(resp, stringContainsInOrder("<OperationOutcome", "FOOBAR"));
}
@Test
public void testValidateWithGet() throws Exception {
ourOutcomeToReturn = new OperationOutcome();
ourOutcomeToReturn.addIssue().setDiagnostics("FOOBAR");
HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/123/$validate");
HttpResponse status = ourClient.execute(httpGet);
String resp = IOUtils.toString(status.getEntity().getContent());
IOUtils.closeQuietly(status.getEntity().getContent());
assertEquals(200, status.getStatusLine().getStatusCode());
assertThat(resp, stringContainsInOrder("<OperationOutcome", "FOOBAR"));
assertEquals(null, ourLastPatient);
assertEquals("Patient", ourLastId.getResourceType());
assertEquals("123", ourLastId.getIdPart());
}
@AfterClass
public static void afterClassClearContext() throws Exception {
ourServer.stop();
@ -292,7 +295,7 @@ public class ValidateDstu3Test {
}
@Validate()
public MethodOutcome validatePatient(@ResourceParam Patient thePatient, @IdParam IdType theId, @Validate.Mode ValidationModeEnum theMode, @Validate.Profile String theProfile) {
public MethodOutcome validatePatient(@ResourceParam Patient thePatient, @IdParam(optional=true) IdType theId, @Validate.Mode ValidationModeEnum theMode, @Validate.Profile String theProfile) {
ourLastPatient = thePatient;
ourLastId = theId;