From fd3e7ead0b3dbad3345d09f66ada8ffb62e967c8 Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 3 Nov 2010 10:58:39 +0000
Subject: [PATCH] SWS-632 - added noFault()

---
 .../ws/test/server/ResponseMatchers.java      | 36 +++++++++++--------
 .../integration/ServerIntegrationTest.java    |  3 +-
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java b/test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java
index 4785515a..1503bcd2 100644
--- a/test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java
+++ b/test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java
@@ -31,7 +31,7 @@ import org.springframework.ws.test.support.PayloadDiffMatcher;
 import org.springframework.xml.transform.ResourceSource;
 
 import static org.springframework.ws.test.support.AssertionErrors.assertEquals;
-import static org.springframework.ws.test.support.AssertionErrors.fail;
+import static org.springframework.ws.test.support.AssertionErrors.assertTrue;
 
 /**
  * Factory methods for {@link ResponseMatcher} classes. Typically used to provide input for {@link
@@ -86,6 +86,22 @@ public abstract class ResponseMatchers {
 
     // SOAP Fault
 
+    /**
+     * Expects the response <strong>not</strong> to contain a SOAP fault.
+     *
+     * @return the response matcher
+     */
+    public static ResponseMatcher noFault() {
+        return new SoapResponseMatcher() {
+            @Override
+            protected void match(SoapMessage response) throws IOException, AssertionError {
+                SoapBody responseBody = response.getSoapBody();
+                assertTrue("Response has no SOAP Body", responseBody != null);
+                assertTrue("Response has a SOAP Fault", !responseBody.hasFault());
+            }
+        };
+    }
+
     /**
      * Expects a {@code MustUnderstand} fault.
      *
@@ -190,12 +206,8 @@ public abstract class ResponseMatchers {
     private static abstract class SoapResponseMatcher implements ResponseMatcher {
 
         public final void match(WebServiceMessage response) throws IOException, AssertionError {
-            if (!(response instanceof SoapMessage)) {
-                fail("Response is not a SOAP message");
-                return;
-            }
-            SoapMessage soapResponse = (SoapMessage) response;
-            match(soapResponse);
+            assertTrue("Response is not a SOAP message", response instanceof SoapMessage);
+            match((SoapMessage) response);
         }
 
         protected abstract void match(SoapMessage response) throws IOException, AssertionError;
@@ -212,14 +224,8 @@ public abstract class ResponseMatchers {
         @Override
         protected void match(SoapMessage response) throws IOException, AssertionError {
             SoapBody responseBody = response.getSoapBody();
-            if (responseBody == null) {
-                fail("Response has no SOAP Body");
-                return;
-            }
-            if (!responseBody.hasFault()) {
-                fail("Response has no SOAP Fault");
-                return;
-            }
+            assertTrue("Response has no SOAP Body", responseBody != null);
+            assertTrue("Response has no SOAP Fault", responseBody.hasFault());
             SoapFault soapFault = responseBody.getFault();
             QName expectedFaultCode = getExpectedFaultCode(response.getVersion());
             assertEquals("Invalid SOAP Fault code", expectedFaultCode, soapFault.getFaultCode());
diff --git a/test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java b/test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java
index 77a89be8..43e96389 100644
--- a/test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java
+++ b/test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java
@@ -30,6 +30,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static org.springframework.ws.test.server.RequestCreators.withPayload;
+import static org.springframework.ws.test.server.ResponseMatchers.noFault;
 import static org.springframework.ws.test.server.ResponseMatchers.payload;
 
 /**
@@ -57,7 +58,7 @@ public class ServerIntegrationTest {
                 "<customerCountResponse xmlns='http://springframework.org/spring-ws'>" +
                         "<customerCount>42</customerCount>" + "</customerCountResponse>");
 
-        mockClient.sendMessage(withPayload(requestPayload)).andExpect(payload(responsePayload));
+        mockClient.sendMessage(withPayload(requestPayload)).andExpect(payload(responsePayload)).andExpect(noFault());
     }