SWS-631 -verifyConnections() method

Author: poutsma

samples/airline/client/spring-ws/src/test/java/org/springframework/ws/samples/airline/client/sws/GetFlightsTest.java

@@ -87,6 +87,8 @@ public void getFlights() throws Exception {
 
         getFlights.getFlights();
 
+        verifyConnections();
+
     }
 
 

test/src/main/java/org/springframework/ws/mock/client/MockWebServiceMessageSender.java

@@ -70,4 +70,13 @@ MockSenderConnection expectNewConnection() {
         return connection;
     }
 
+    void verifyConnections() {
+        if (expectedConnections.isEmpty()) {
+            return;
+        }
+        if (connectionIterator == null || connectionIterator.hasNext()) {
+            throw new AssertionError("Further connection(s) expected");
+        }
+    }
+
 }

test/src/main/java/org/springframework/ws/mock/client/WebServiceMock.java

@@ -282,6 +282,20 @@ public static ResponseCallback withVersionMismatchFault(String faultStringOrReas
         return SoapFaultResponseCallback.createVersionMismatchFault(faultStringOrReason, locale);
     }
 
+    // Verification
+
+    /**
+     * Verifies that all connections were used.
+     *
+     * @throws AssertionError in case of unused connections.
+     */
+    public static void verifyConnections() {
+        MockWebServiceMessageSender messageSender = MockWebServiceMessageSenderHolder.get();
+        if (messageSender != null) {
+            messageSender.verifyConnections();
+        }
+    }
+
     private static ResourceSource createResourceSource(Resource resource) {
         try {
             return new ResourceSource(resource);

test/src/test/java/org/springframework/ws/mock/client/MockWebServiceMessageSenderTest.java

@@ -19,13 +19,34 @@
 import java.io.IOException;
 import java.net.URI;
 
+import org.junit.Before;
 import org.junit.Test;
 
 public class MockWebServiceMessageSenderTest {
 
+    private MockWebServiceMessageSender sender;
+
+    @Before
+    public void setUp() throws Exception {
+        sender = new MockWebServiceMessageSender();
+    }
+
+    @Test(expected = AssertionError.class)
+    public void noMoreExpectedConnections() throws IOException {
+        sender.createConnection(URI.create("http://localhost"));
+    }
+
+    @Test(expected = AssertionError.class)
+    public void verify() throws IOException {
+        sender.expectNewConnection();
+        sender.verifyConnections();
+    }
+
     @Test(expected = AssertionError.class)
-    public void testNoMoreExpectedConnections() throws IOException {
-        MockWebServiceMessageSender sender = new MockWebServiceMessageSender();
+    public void verifyMoteThanOne() throws IOException {
+        sender.expectNewConnection();
+        sender.expectNewConnection();
         sender.createConnection(URI.create("http://localhost"));
+        sender.verifyConnections();
     }
 }

test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java

@@ -225,6 +225,8 @@ public void anythingMatch() throws Exception {
         StringResult result = new StringResult();
         template.sendSourceAndReceiveToResult(request, result);
         assertXMLEqual(result.toString(), response.toString());
+
+        verifyConnections();
     }
 
     @Test(expected = IllegalStateException.class)
@@ -242,5 +244,14 @@ public void recordWhenReplay() throws Exception {
         expect(anything()).andRespond(withPayload(response));
     }
 
+    @Test(expected = AssertionError.class)
+    public void verifyFailure() throws Exception {
+        expect(anything());
+        verifyConnections();
+    }
 
+    @Test
+    public void verifyOnly() throws Exception {
+        verifyConnections();
+    }
 }

test/src/test/java/org/springframework/ws/mock/client/integration/IntegrationTest.java

@@ -63,6 +63,8 @@ public void basic() throws Exception {
 
         CustomerCountResponse response = (CustomerCountResponse) webServiceTemplate.marshalSendAndReceive(request);
         assertEquals(10, response.getCustomerCount());
+        
+        verifyConnections();
     }
 
 }