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

fixing tests

This commit is contained in:
leif stawnyczy 2024-08-12 09:48:40 -04:00
parent 0110242f6f
commit 30ec4256c3
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseHttpClientInvocationWithContents.java
View File

@ -179,6 +179,7 @@ abstract class BaseHttpClientInvocationWithContents extends BaseHttpClientInvoca
parameters.setContentType(contentType);
parameters.setFhirContext(getContext());
parameters.setEncodingEnum(encoding);
parameters.setRequestTypeEnum(getRequestType());
IHttpRequest request = httpClient.createRequest(parameters);
for (Header header : getHeaders()) {
request.addHeader(header.getName(), header.getValue());

2
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/client/JaxRsHttpClient.java
View File

@ -88,6 +88,7 @@ public class JaxRsHttpClient implements IHttpClient {
public IHttpRequest createParamRequest(
FhirContext theContext, Map<String, List<String>> theParams, EncodingEnum theEncoding) {
Entity<Form> entity = getFormEntity(theParams);
myRequestType = RequestTypeEnum.POST;
JaxRsHttpRequest retVal = createHttpRequest(entity);
addHeadersToRequest(retVal, theEncoding, theContext);
return retVal;
@ -124,6 +125,7 @@ public class JaxRsHttpClient implements IHttpClient {
public IHttpRequest createRequest(HttpClientRequestParameters theParameters) {
Map<String, String> additionalHeaders = new HashMap<>();
Entity<?> entity;
myRequestType = theParameters.getRequestTypeEnum();
switch (theParameters.getRequestTypeEnum()) {
case POST:
case PUT:

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

@ -75,7 +75,6 @@ public class GenericJaxRsClientDstu2Test {
}
private String getPatientFeedWithOneResult() {
String msg = "<Bundle xmlns=\"http://hl7.org/fhir\">\n" +
"<id>d039f91a-cc3c-4013-988e-af4d8d0614bd</id>\n" +
"<entry>\n" +
@ -108,24 +107,20 @@ public class GenericJaxRsClientDstu2Test {
IGenericClient client = ourCtx.newRestfulGenericClient(ourServer.getBaseUrl() + "/fhir");
client.fetchConformance().ofType(Conformance.class).execute();
assertEquals(ourServer.getBaseUrl() + "/fhir/metadata", CAPTURE_SERVLET.ourRequestUri);
assertThat(CAPTURE_SERVLET.ourRequestHeaders.get("Accept")).hasSize(1);
assertThat(CAPTURE_SERVLET.ourRequestHeaders.get("Accept").get(0).getValue()).contains(Constants.HEADER_ACCEPT_VALUE_XML_OR_JSON_LEGACY);
client.fetchConformance().ofType(Conformance.class).encodedJson().execute();
assertEquals(ourServer.getBaseUrl() + "/fhir/metadata?_format=json", CAPTURE_SERVLET.ourRequestUri);
assertThat(CAPTURE_SERVLET.ourRequestHeaders.get("Accept")).hasSize(1);
assertThat(CAPTURE_SERVLET.ourRequestHeaders.get("Accept").get(0).getValue()).contains(Constants.CT_FHIR_JSON);
client.fetchConformance().ofType(Conformance.class).encodedXml().execute();
assertEquals(ourServer.getBaseUrl() + "/fhir/metadata?_format=xml", CAPTURE_SERVLET.ourRequestUri);
assertThat(CAPTURE_SERVLET.ourRequestHeaders.get("Accept")).hasSize(1);
assertThat(CAPTURE_SERVLET.ourRequestHeaders.get("Accept").get(0).getValue()).contains(Constants.CT_FHIR_XML);
}
@Test
@ -888,7 +883,6 @@ public class GenericJaxRsClientDstu2Test {
.withParameter(Parameters.class, "name1", weirdBase)
.execute();
});
}
@Test
@ -900,13 +894,11 @@ public class GenericJaxRsClientDstu2Test {
outParams.addParameter().setValue(new StringDt("STRINGVALOUT2"));
final String respString = p.encodeResourceToString(outParams);
CAPTURE_SERVLET.ourResponseContentType = Constants.CT_FHIR_XML + "; charset=UTF-8";
CAPTURE_SERVLET.ourResponseBody = respString;
IGenericClient client = ourCtx.newRestfulGenericClient(ourServer.getBaseUrl() + "/fhir");
client
.operation()
.onInstance(new IdDt("http://foo/Patient/1"))
@ -916,10 +908,8 @@ public class GenericJaxRsClientDstu2Test {
.useHttpGet()
.execute();
assertEquals(ourServer.getBaseUrl() + "/fhir/Patient/1/$validate-code?code=8495-4&system=http%3A%2F%2Floinc.org", CAPTURE_SERVLET.ourRequestUri);
client
.operation()
.onInstance(new IdDt("http://foo/Patient/1"))
@ -927,7 +917,6 @@ public class GenericJaxRsClientDstu2Test {
.withParameter(Parameters.class, "code", new CodeDt("8495-4"))
.andParameter("system", new UriDt("http://loinc.org"))
.encodedXml()
.encodedXml()
.execute();