From 5d2e830b156f5ebf3d48436cee39e7a1cf42fe66 Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Sun, 24 Jan 2021 12:09:50 -0500
Subject: [PATCH] Fix android tests (#2321)

---
 hapi-fhir-android/pom.xml                                   | 5 +++++
 .../ca/uhn/fhir/android/client/GenericClientDstu3IT.java    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
index f39f6d9ae41..73db7d5cb06 100644
--- a/hapi-fhir-android/pom.xml
+++ b/hapi-fhir-android/pom.xml
@@ -103,12 +103,17 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
 				<configuration>
+					<classpathDependencyExcludes>
+						<dependencyExclude>org.slf4j:slf4j-android</dependencyExclude>
+					</classpathDependencyExcludes>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
 				</configuration>
 				<executions>
 					<execution>
 						<id>it</id>
 						<goals>
 							<goal>integration-test</goal>
+							<goal>verify</goal>
 						</goals>
 						<configuration>
 							<includes>
diff --git a/hapi-fhir-android/src/test/java/ca/uhn/fhir/android/client/GenericClientDstu3IT.java b/hapi-fhir-android/src/test/java/ca/uhn/fhir/android/client/GenericClientDstu3IT.java
index 1c5cb01529f..cf1242ca8d5 100644
--- a/hapi-fhir-android/src/test/java/ca/uhn/fhir/android/client/GenericClientDstu3IT.java
+++ b/hapi-fhir-android/src/test/java/ca/uhn/fhir/android/client/GenericClientDstu3IT.java
@@ -143,7 +143,7 @@ public class GenericClientDstu3IT {
       	.returnBundle(Bundle.class)
       	.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++;
 		
 	}
@@ -178,7 +178,7 @@ public class GenericClientDstu3IT {
 		Request request = capt.getAllValues().get(0);
 		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);
 
 		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());
 
 		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());
 	}