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

Rework tests which relied on old behaviour

This commit is contained in:
Tadgh 2021-03-01 14:19:20 -05:00
parent 9dd42fa605
commit 11b413ee9b
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-structures-dstu2.1/src/test/java/ca/uhn/fhir/rest/server/ServerMimetypeDstu2_1Test.java
View File

@ -47,6 +47,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -67,7 +68,7 @@ public class ServerMimetypeDstu2_1Test {
ourLog.info(content); ourLog.info(content);
Conformance conf = ourCtx.newXmlParser().parseResource(Conformance.class, content); Conformance conf = ourCtx.newXmlParser().parseResource(Conformance.class, content);
List<String> strings = toStrings(conf.getFormat()); List<String> strings = toStrings(conf.getFormat());
assertThat(strings, contains(Constants.CT_FHIR_XML, Constants.CT_FHIR_JSON)); assertThat(strings, hasItems(Constants.CT_FHIR_XML_NEW, Constants.CT_FHIR_JSON_NEW, Constants.FORMAT_XML, Constants.FORMAT_JSON));
} finally { } finally {
status.close(); status.close();
} }

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

@ -47,6 +47,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -66,7 +67,7 @@ public class ServerMimetypeDstu3Test {
String content = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8); String content = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
CapabilityStatement conf = ourCtx.newXmlParser().parseResource(CapabilityStatement.class, content); CapabilityStatement conf = ourCtx.newXmlParser().parseResource(CapabilityStatement.class, content);
List<String> strings = toStrings(conf.getFormat()); List<String> strings = toStrings(conf.getFormat());
assertThat(strings, contains(Constants.CT_FHIR_XML_NEW, Constants.CT_FHIR_JSON_NEW)); assertThat(strings, hasItems(Constants.CT_FHIR_XML_NEW, Constants.CT_FHIR_JSON_NEW, Constants.FORMAT_XML, Constants.FORMAT_JSON));
} finally { } finally {
status.close(); status.close();
} }

4
hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/ServerMimetypeR4Test.java
View File

@ -49,6 +49,7 @@ import java.util.concurrent.TimeUnit;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
@ -85,12 +86,13 @@ public class ServerMimetypeR4Test {
String content = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8); String content = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
CapabilityStatement conf = ourCtx.newXmlParser().parseResource(CapabilityStatement.class, content); CapabilityStatement conf = ourCtx.newXmlParser().parseResource(CapabilityStatement.class, content);
List<String> strings = toStrings(conf.getFormat()); List<String> strings = toStrings(conf.getFormat());
assertThat(strings, contains(Constants.CT_FHIR_XML_NEW, Constants.CT_FHIR_JSON_NEW)); assertThat(strings, hasItems(Constants.CT_FHIR_XML_NEW, Constants.CT_FHIR_JSON_NEW, Constants.FORMAT_XML, Constants.FORMAT_JSON));
} finally { } finally {
status.close(); status.close();
} }
} }
@Test @Test
public void testCreateWithJsonLegacyNoAcceptHeader() throws Exception { public void testCreateWithJsonLegacyNoAcceptHeader() throws Exception {
Patient p = new Patient(); Patient p = new Patient();