Fix #268 - Technically already fixed, just updating unit tests

This commit is contained in:
James Agnew 2016-03-25 18:47:52 -04:00
parent d3dc9a9c2b
commit e5f353c27e
2 changed files with 5 additions and 5 deletions

View File

@ -1,5 +1,7 @@
package ca.uhn.fhir.rest.client; package ca.uhn.fhir.rest.client;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@ -28,7 +30,6 @@ import ca.uhn.fhir.model.api.annotation.ResourceDef;
import ca.uhn.fhir.model.dstu2.resource.OperationOutcome; import ca.uhn.fhir.model.dstu2.resource.OperationOutcome;
import ca.uhn.fhir.model.dstu2.resource.Patient; import ca.uhn.fhir.model.dstu2.resource.Patient;
import ca.uhn.fhir.model.dstu2.valueset.IssueTypeEnum; import ca.uhn.fhir.model.dstu2.valueset.IssueTypeEnum;
import ca.uhn.fhir.rest.api.MethodOutcome;
import ca.uhn.fhir.rest.server.Constants; import ca.uhn.fhir.rest.server.Constants;
public class ClientWithProfileDstu2Test { public class ClientWithProfileDstu2Test {
@ -70,13 +71,13 @@ public class ClientWithProfileDstu2Test {
int idx = 0; int idx = 0;
MethodOutcome response = client.create().resource(new MyPatient()).execute(); client.create().resource(new MyPatient()).execute();
HttpPost value = (HttpPost) capt.getAllValues().get(idx); HttpPost value = (HttpPost) capt.getAllValues().get(idx);
String requestBody = IOUtils.toString(((HttpPost) value).getEntity().getContent()); String requestBody = IOUtils.toString(((HttpPost) value).getEntity().getContent());
IOUtils.closeQuietly(((HttpPost) value).getEntity().getContent()); IOUtils.closeQuietly(((HttpPost) value).getEntity().getContent());
ourLog.info(requestBody); ourLog.info(requestBody);
assertThat(requestBody, containsString("<meta><profile value=\"http://foo_profile\"/></meta>"));
} }
@ResourceDef(name = "Patient", profile = "http://foo_profile") @ResourceDef(name = "Patient", profile = "http://foo_profile")

View File

@ -94,11 +94,10 @@ public class ReadDstu2Test {
} }
/** /**
* See #302 * See #302 and #268
*/ */
@Test @Test
public void testAddProfileToExistingList() throws Exception { public void testAddProfileToExistingList() throws Exception {
ourServlet.setAddProfileTag(AddProfileTagEnum.ALWAYS);
ourInitializeProfileList = true; ourInitializeProfileList = true;
HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/123&_format=xml"); HttpGet httpGet = new HttpGet("http://localhost:" + ourPort + "/Patient/123&_format=xml");