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

Fix tests

This commit is contained in:
James Agnew 2017-07-12 09:16:55 -04:00
parent 38b7212e52
commit a337d282e3
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hapi-fhir-structures-dstu2/pom.xml
View File

@ -27,6 +27,13 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- Testing --> <!-- Testing -->
<!-- <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu</artifactId> <version>0.8</version> <scope>test</scope> </dependency> --> <!-- <dependency> <groupId>ca.uhn.hapi.fhir</groupId> <artifactId>hapi-fhir-structures-dstu</artifactId> <version>0.8</version> <scope>test</scope> </dependency> -->
<dependency> <dependency>

8
hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlightingInterceptorTest.java
View File

@ -94,7 +94,7 @@ public class ResponseHighlightingInterceptorTest {
IOUtils.closeQuietly(status.getEntity().getContent()); IOUtils.closeQuietly(status.getEntity().getContent());
ourLog.info(responseContent); ourLog.info(responseContent);
assertEquals(200, status.getStatusLine().getStatusCode()); assertEquals(200, status.getStatusLine().getStatusCode());
assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "\n", "</pre>"))); assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
} }
/** /**
@ -112,7 +112,7 @@ public class ResponseHighlightingInterceptorTest {
IOUtils.closeQuietly(status.getEntity().getContent()); IOUtils.closeQuietly(status.getEntity().getContent());
ourLog.info(responseContent); ourLog.info(responseContent);
assertEquals(200, status.getStatusLine().getStatusCode()); assertEquals(200, status.getStatusLine().getStatusCode());
assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "\n", "</pre>"))); assertThat(responseContent, (stringContainsInOrder("<body>", "<pre>", "<div", "</pre>")));
} }
/** /**
@ -326,7 +326,7 @@ public class ResponseHighlightingInterceptorTest {
String output = sw.getBuffer().toString(); String output = sw.getBuffer().toString();
ourLog.info(output); ourLog.info(output);
assertThat(output, containsString("<span class='hlTagName'>Patient</span>")); assertThat(output, containsString("<span class='hlTagName'>Patient</span>"));
assertThat(output, stringContainsInOrder("<body>", "<pre>", "\n", "</pre>")); assertThat(output, stringContainsInOrder("<body>", "<pre>", "<div", "</pre>"));
} }
@Test @Test
@ -498,7 +498,7 @@ public class ResponseHighlightingInterceptorTest {
String output = sw.getBuffer().toString(); String output = sw.getBuffer().toString();
ourLog.info(output); ourLog.info(output);
assertThat(output, containsString("<span class='hlTagName'>Patient</span>")); assertThat(output, containsString("<span class='hlTagName'>Patient</span>"));
assertThat(output, stringContainsInOrder("<body>", "<pre>", "\n", "</pre>")); assertThat(output, stringContainsInOrder("<body>", "<pre>", "<div", "</pre>"));
assertThat(output, containsString("<a href=\"?_format=json\">")); assertThat(output, containsString("<a href=\"?_format=json\">"));
} }