From ecf570ced9d40fa32a78f4646dd15571b441ccc7 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Thu, 1 Mar 2018 07:25:35 -0500 Subject: [PATCH] More testing on #872 --- .../dstu3/ResourceProviderDstu3Test.java | 39 +++++++++ .../provider/r4/ResourceProviderR4Test.java | 81 ++++++++++++------- 2 files changed, 93 insertions(+), 27 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java index 9dea55a78ed..713b9ecdf2e 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu3/ResourceProviderDstu3Test.java @@ -16,7 +16,9 @@ import java.net.*; import java.nio.charset.StandardCharsets; import java.util.*; +import ca.uhn.fhir.jpa.provider.r4.ResourceProviderR4Test; import ca.uhn.fhir.rest.api.Constants; +import com.google.common.base.Charsets; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; @@ -26,6 +28,7 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.*; import org.apache.http.entity.*; import org.apache.http.message.BasicNameValuePair; +import org.hl7.fhir.dstu3.hapi.validation.FhirInstanceValidator; import org.hl7.fhir.dstu3.model.*; import org.hl7.fhir.dstu3.model.Bundle.*; import org.hl7.fhir.dstu3.model.Encounter.EncounterLocationComponent; @@ -82,6 +85,42 @@ public class ResourceProviderDstu3Test extends BaseResourceProviderDstu3Test { } + + /** + * See #872 + */ + @Test + public void testExtensionUrlWithHl7UrlPost() throws IOException { + + ValueSet vs = myValidationSupport.fetchResource(myFhirCtx, ValueSet.class, "http://hl7.org/fhir/ValueSet/v3-ActInvoiceGroupCode"); + myValueSetDao.create(vs); + + + RequestValidatingInterceptor interceptor = new RequestValidatingInterceptor(); + FhirInstanceValidator val = new FhirInstanceValidator(myValidationSupport); + interceptor.addValidatorModule(val); + + ourRestServer.registerInterceptor(interceptor); + try { + String input = IOUtils.toString(ResourceProviderR4Test.class.getResourceAsStream("/bug872-ext-with-hl7-url.json"), Charsets.UTF_8); + + HttpPost post = new HttpPost(ourServerBase + "/Patient/aaa"); + post.setEntity(new StringEntity(input, ContentType.APPLICATION_JSON)); + + CloseableHttpResponse resp = ourHttpClient.execute(post); + try { + String respString = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8); + ourLog.info(respString); + assertEquals(400, resp.getStatusLine().getStatusCode()); + } finally { + IOUtils.closeQuietly(resp); + } + } finally { + ourRestServer.unregisterInterceptor(interceptor); + } + } + + @Override public void before() throws Exception { super.before(); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java index 0d8408a0972..c950374256c 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java @@ -25,8 +25,6 @@ import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException; import ca.uhn.fhir.rest.server.interceptor.RequestValidatingInterceptor; import ca.uhn.fhir.util.TestUtil; import ca.uhn.fhir.util.UrlUtil; -import ca.uhn.fhir.validation.FhirValidator; -import ca.uhn.fhir.validation.ValidationResult; import com.google.common.base.Charsets; import com.google.common.collect.Lists; import org.apache.commons.io.IOUtils; @@ -44,6 +42,7 @@ import org.hl7.fhir.instance.model.api.IBaseBundle; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.IIdType; +import org.hl7.fhir.r4.hapi.validation.FhirInstanceValidator; import org.hl7.fhir.r4.model.*; import org.hl7.fhir.r4.model.Bundle.*; import org.hl7.fhir.r4.model.Encounter.EncounterLocationComponent; @@ -134,27 +133,6 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test { return retVal; } - /** - * See #872 - */ - @Test - public void testExtensionUrlWithHl7Url() throws IOException { - String input = IOUtils.toString(ResourceProviderR4Test.class.getResourceAsStream("/bug872-ext-with-hl7-url.json"), Charsets.UTF_8); - - HttpPost post = new HttpPost(ourServerBase + "/Patient/$validate"); - post.setEntity(new StringEntity(input, ContentType.APPLICATION_JSON)); - - CloseableHttpResponse resp = ourHttpClient.execute(post); - try { - String respString = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8); - ourLog.info(respString); - assertEquals(200, resp.getStatusLine().getStatusCode()); - } finally { - IOUtils.closeQuietly(resp); - } - } - - /** * See #484 */ @@ -313,7 +291,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test { Binary fromDB = myClient.read().resource(Binary.class).withId(resource.toVersionless()).execute(); assertEquals("1", fromDB.getIdElement().getVersionIdPart()); - arr[0] = 2; + arr[ 0 ] = 2; HttpPut putRequest = new HttpPut(ourServerBase + "/Binary/" + resource.getIdPart()); putRequest.setEntity(new ByteArrayEntity(arr, ContentType.parse("dansk"))); CloseableHttpResponse resp = ourHttpClient.execute(putRequest); @@ -327,7 +305,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test { fromDB = myClient.read().resource(Binary.class).withId(resource.toVersionless()).execute(); assertEquals("2", fromDB.getIdElement().getVersionIdPart()); - arr[0] = 3; + arr[ 0 ] = 3; fromDB.setContent(arr); String encoded = myFhirCtx.newJsonParser().encodeResourceToString(fromDB); putRequest = new HttpPut(ourServerBase + "/Binary/" + resource.getIdPart()); @@ -345,7 +323,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test { // Now an update with the wrong ID in the body - arr[0] = 4; + arr[ 0 ] = 4; binary.setId(""); encoded = myFhirCtx.newJsonParser().encodeResourceToString(binary); putRequest = new HttpPut(ourServerBase + "/Binary/" + resource.getIdPart()); @@ -844,7 +822,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test { // String response = ""; StringBuilder b = new StringBuilder(); - char[] buf = new char[1000]; + char[] buf = new char[ 1000 ]; while (socketInput.read(buf) != -1) { b.append(buf); } @@ -1567,6 +1545,55 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test { assertEquals(1, response.getEntry().size()); } + /** + * See #872 + */ + @Test + public void testExtensionUrlWithHl7Url() throws IOException { + String input = IOUtils.toString(ResourceProviderR4Test.class.getResourceAsStream("/bug872-ext-with-hl7-url.json"), Charsets.UTF_8); + + HttpPost post = new HttpPost(ourServerBase + "/Patient/$validate"); + post.setEntity(new StringEntity(input, ContentType.APPLICATION_JSON)); + + CloseableHttpResponse resp = ourHttpClient.execute(post); + try { + String respString = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8); + ourLog.info(respString); + assertEquals(200, resp.getStatusLine().getStatusCode()); + } finally { + IOUtils.closeQuietly(resp); + } + } + + /** + * See #872 + */ + @Test + public void testExtensionUrlWithHl7UrlPost() throws IOException { + RequestValidatingInterceptor interceptor = new RequestValidatingInterceptor(); + FhirInstanceValidator val = new FhirInstanceValidator(myValidationSupport); + interceptor.addValidatorModule(val); + + ourRestServer.registerInterceptor(interceptor); + try { + String input = IOUtils.toString(ResourceProviderR4Test.class.getResourceAsStream("/bug872-ext-with-hl7-url.json"), Charsets.UTF_8); + + HttpPost post = new HttpPost(ourServerBase + "/Patient/aaa"); + post.setEntity(new StringEntity(input, ContentType.APPLICATION_JSON)); + + CloseableHttpResponse resp = ourHttpClient.execute(post); + try { + String respString = IOUtils.toString(resp.getEntity().getContent(), Charsets.UTF_8); + ourLog.info(respString); + assertEquals(400, resp.getStatusLine().getStatusCode()); + } finally { + IOUtils.closeQuietly(resp); + } + } finally { + ourRestServer.unregisterInterceptor(interceptor); + } + } + @SuppressWarnings("unused") @Test public void testFullTextSearch() throws Exception {