Fix unit test for #108

hapi-fhir-structures-dstu/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationTestDstu.java

@@ -4,6 +4,7 @@ import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+import java.io.InputStream;
 import java.io.StringReader;
 import java.nio.charset.Charset;
 
@@ -19,9 +20,13 @@ import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Matchers;
 import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.dstu.resource.Conformance;
+import ca.uhn.fhir.model.dstu.resource.Patient;
+import ca.uhn.fhir.model.primitive.UriDt;
 import ca.uhn.fhir.rest.client.exceptions.FhirClientConnectionException;
 import ca.uhn.fhir.rest.server.Constants;
 
@@ -30,11 +35,13 @@ public class ClientServerValidationTestDstu {
 	private FhirContext myCtx;
 	private HttpClient myHttpClient;
 	private HttpResponse myHttpResponse;
+	private boolean myFirstResponse;
 
 	@Before
 	public void before() {
 		myHttpClient = mock(HttpClient.class, new ReturnsDeepStubs());
 		myHttpResponse = mock(HttpResponse.class, new ReturnsDeepStubs());
+		myFirstResponse = true;
 
 		myCtx = FhirContext.forDstu1();
 		myCtx.getRestfulClientFactory().setHttpClient(myHttpClient);
@@ -44,21 +51,37 @@ public class ClientServerValidationTestDstu {
 	public void testServerReturnsAppropriateVersionDstu() throws Exception {
 		Conformance conf = new Conformance();
 		conf.setFhirVersion("0.0.8");
-		String msg = myCtx.newXmlParser().encodeResourceToString(conf);
+		final String confResource = myCtx.newXmlParser().encodeResourceToString(conf);
 
 		ArgumentCaptor<HttpUriRequest> capt = ArgumentCaptor.forClass(HttpUriRequest.class);
 
 		when(myHttpResponse.getStatusLine()).thenReturn(new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK"));
 		when(myHttpResponse.getEntity().getContentType()).thenReturn(new BasicHeader("content-type", Constants.CT_FHIR_XML + "; charset=UTF-8"));
-		when(myHttpResponse.getEntity().getContent()).thenReturn(new ReaderInputStream(new StringReader(msg), Charset.forName("UTF-8")));
+		when(myHttpResponse.getEntity().getContent()).thenAnswer(new Answer<InputStream>() {
+			@Override
+			public InputStream answer(InvocationOnMock theInvocation) throws Throwable {
+				if (myFirstResponse) {
+					myFirstResponse=false;
+					return new ReaderInputStream(new StringReader(confResource), Charset.forName("UTF-8"));
+				} else {
+					return new ReaderInputStream(new StringReader(myCtx.newXmlParser().encodeResourceToString(new Patient())), Charset.forName("UTF-8"));
+				}
+			}});
 
 		when(myHttpClient.execute(capt.capture())).thenReturn(myHttpResponse);
 
 		myCtx.getRestfulClientFactory().setServerValidationModeEnum(ServerValidationModeEnum.ONCE);
-		myCtx.newRestfulGenericClient("http://foo");
+		IGenericClient client = myCtx.newRestfulGenericClient("http://foo");
-		myCtx.newRestfulGenericClient("http://foo");
 		
-		verify(myHttpClient, times(1)).execute(Matchers.any(HttpUriRequest.class));
+		// don't load the conformance until the first time the client is actually used 
+		assertTrue(myFirstResponse); 
+		client.read(new UriDt("http://foo/Patient/123"));
+		assertFalse(myFirstResponse);
+		myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123"));
+		myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123"));
+
+		// Conformance only loaded once, then 3 reads
+		verify(myHttpClient, times(4)).execute(Matchers.any(HttpUriRequest.class));
 	}
 
 	@Test
@@ -77,7 +100,7 @@ public class ClientServerValidationTestDstu {
 
 		myCtx.getRestfulClientFactory().setServerValidationModeEnum(ServerValidationModeEnum.ONCE);
 		try {
-			myCtx.newRestfulGenericClient("http://foo");
+			myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/1"));
 			fail();
 		} catch (FhirClientConnectionException e) {
 			assertThat(e.toString(), containsString("The server at base URL \"http://foo/metadata\" returned a conformance statement indicating that it supports FHIR version \"0.4.0\" which corresponds to DSTU2, but this client is configured to use DSTU1 (via the FhirContext)"));

hapi-fhir-structures-dstu2/src/test/java/ca/uhn/fhir/rest/client/ClientServerValidationTestDstu2.java

@@ -104,7 +104,7 @@ public class ClientServerValidationTestDstu2 {
 
 		myCtx.getRestfulClientFactory().setServerValidationModeEnum(ServerValidationModeEnum.ONCE);
 		try {
-			myCtx.newRestfulGenericClient("http://foo");
+			myCtx.newRestfulGenericClient("http://foo").read(new UriDt("http://foo/Patient/123"));
 			fail();
 		} catch (FhirClientConnectionException e) {
 			String out = e.toString();