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

Fix android tests (#2321)

This commit is contained in:
James Agnew 2021-01-24 12:09:50 -05:00 committed by GitHub
parent 66e6cab21f
commit 5d2e830b15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-android/pom.xml
View File

@ -103,12 +103,17 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<configuration> <configuration>
<classpathDependencyExcludes>
<dependencyExclude>org.slf4j:slf4j-android</dependencyExclude>
</classpathDependencyExcludes>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>it</id> <id>it</id>
<goals> <goals>
<goal>integration-test</goal> <goal>integration-test</goal>
<goal>verify</goal>
</goals> </goals>
<configuration> <configuration>
<includes> <includes>

6
hapi-fhir-android/src/test/java/ca/uhn/fhir/android/client/GenericClientDstu3IT.java
View File

@ -143,7 +143,7 @@ public class GenericClientDstu3IT {
.returnBundle(Bundle.class) .returnBundle(Bundle.class)
.execute(); .execute();
assertEquals("http://example.com/fhir/Patient?_format=json", capt.getAllValues().get(idx).url().toString()); assertEquals("http://example.com/fhir/Patient", capt.getAllValues().get(idx).url().toString());
idx++; idx++;
} }
@ -178,7 +178,7 @@ public class GenericClientDstu3IT {
Request request = capt.getAllValues().get(0); Request request = capt.getAllValues().get(0);
ourLog.info(request.headers().toString()); ourLog.info(request.headers().toString());
assertEquals("http://example.com/fhir/Binary?_format=json", request.url().toString()); assertEquals("http://example.com/fhir/Binary", request.url().toString());
validateUserAgent(capt); validateUserAgent(capt);
assertEquals(Constants.CT_FHIR_JSON_NEW + ";charset=utf-8", request.body().contentType().toString().toLowerCase().replace(" ", "")); assertEquals(Constants.CT_FHIR_JSON_NEW + ";charset=utf-8", request.body().contentType().toString().toLowerCase().replace(" ", ""));
@ -252,7 +252,7 @@ public class GenericClientDstu3IT {
assertNotNull(outcome.getResource()); assertNotNull(outcome.getResource());
assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">FINAL VALUE</div>", ((Patient) outcome.getResource()).getText().getDivAsString()); assertEquals("<div xmlns=\"http://www.w3.org/1999/xhtml\">FINAL VALUE</div>", ((Patient) outcome.getResource()).getText().getDivAsString());
assertEquals("http://example.com/fhir/Patient?_format=json", capt.getAllValues().get(0).url().toString()); assertEquals("http://example.com/fhir/Patient", capt.getAllValues().get(0).url().toString());
} }