From dda706b82a3a6c1b793fa1c2174076ff61682723 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 22 Sep 2010 13:25:58 +0000 Subject: [PATCH] Allow for extensions to create faults --- .../ws/mock/client/MockSenderConnection.java | 15 +++------------ .../ws/mock/client/WebServiceMockTest.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java index 43d33441..8a05a6a1 100644 --- a/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java +++ b/test/src/main/java/org/springframework/ws/mock/client/MockSenderConnection.java @@ -24,17 +24,16 @@ import java.util.List; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.WebServiceMessageFactory; -import org.springframework.ws.transport.FaultAwareWebServiceConnection; +import org.springframework.ws.transport.WebServiceConnection; /** - * Mock implementation of {@link FaultAwareWebServiceConnection}. Implements {@link ResponseActions} to form a fluent - * API. + * Mock implementation of {@link WebServiceConnection}. Implements {@link ResponseActions} to form a fluent API. * * @author Arjen Poutsma * @author Lukas Krecan * @since 2.0 */ -class MockSenderConnection implements FaultAwareWebServiceConnection, ResponseActions { +class MockSenderConnection implements WebServiceConnection, ResponseActions { private final List requestMatchers = new LinkedList(); @@ -114,14 +113,6 @@ class MockSenderConnection implements FaultAwareWebServiceConnection, ResponseAc } } - public boolean hasFault() throws IOException { - return responseCreator instanceof SoapFaultResponseCreator; - } - - public void setFault(boolean fault) throws IOException { - // Do nothing - } - public void close() throws IOException { requestMatchers.clear(); request = null; diff --git a/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java b/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java index 846bdc9d..f64ef2ef 100644 --- a/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java +++ b/test/src/test/java/org/springframework/ws/mock/client/WebServiceMockTest.java @@ -19,6 +19,7 @@ package org.springframework.ws.mock.client; import java.io.IOException; import java.net.URI; import java.util.Collections; +import java.util.Locale; import java.util.Map; import javax.xml.namespace.QName; import javax.xml.soap.MessageFactory; @@ -31,6 +32,7 @@ import org.springframework.ws.WebServiceMessage; import org.springframework.ws.client.core.WebServiceMessageCallback; import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.ws.soap.SoapMessage; +import org.springframework.ws.soap.client.SoapFaultClientException; import org.springframework.ws.soap.saaj.SaajSoapMessage; import org.springframework.ws.soap.saaj.SaajSoapMessageFactory; import org.springframework.xml.transform.StringResult; @@ -259,4 +261,14 @@ public class WebServiceMockTest { public void verifyOnly() throws Exception { verifyConnections(); } + + @Test(expected = SoapFaultClientException.class) + public void fault() throws Exception { + Source request = new StringSource(""); + + expect(anything()).andRespond(withClientOrSenderFault("reason", Locale.ENGLISH)); + + StringResult result = new StringResult(); + template.sendSourceAndReceiveToResult(request, result); + } }