SWS-632 - Renamed mock to test

test/src/main/java/org/springframework/ws/test/client/AbstractResponseCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/DefaultXPathExpectations.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -30,8 +30,8 @@ import org.springframework.xml.xpath.XPathExpressionFactory;
 
 import org.w3c.dom.Node;
 
-import static org.springframework.ws.mock.support.Assert.assertEquals;
-import static org.springframework.ws.mock.support.Assert.fail;
+import static org.springframework.ws.test.support.Assert.assertEquals;
+import static org.springframework.ws.test.support.Assert.fail;
 
 /**
  * Default implementation of {@link XPathExpectations}.

test/src/main/java/org/springframework/ws/test/client/ErrorResponseCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/ExceptionResponseCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/MockSenderConnection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/MockWebServiceMessageSenderHolder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import org.springframework.core.NamedThreadLocal;
 

test/src/main/java/org/springframework/ws/test/client/PayloadResponseCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/RequestMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/ResponseActions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 /**
  * Allows for setting up responses. Implementations of this interface are returned by {@link WebServiceMock}.

test/src/main/java/org/springframework/ws/test/client/ResponseCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/SchemaValidatingRequestMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/SoapFaultResponseCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -23,7 +23,7 @@ import java.util.Locale;
 import org.springframework.ws.soap.SoapBody;
 import org.springframework.ws.soap.SoapMessage;
 
-import static org.springframework.ws.mock.support.Assert.fail;
+import static org.springframework.ws.test.support.Assert.fail;
 
 /**
  * Implementation of {@link ResponseCreator} that responds with a SOAP fault.

test/src/main/java/org/springframework/ws/test/client/SoapHeaderMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -26,8 +26,8 @@ import org.springframework.ws.soap.SoapHeader;
 import org.springframework.ws.soap.SoapHeaderElement;
 import org.springframework.ws.soap.SoapMessage;
 
-import static org.springframework.ws.mock.support.Assert.assertTrue;
-import static org.springframework.ws.mock.support.Assert.fail;
+import static org.springframework.ws.test.support.Assert.assertTrue;
+import static org.springframework.ws.test.support.Assert.fail;
 
 /**
  * Matches SOAP headers.

test/src/main/java/org/springframework/ws/test/client/ThreadLocalMockWebServiceMessageSender.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/main/java/org/springframework/ws/test/client/UriMatcher.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.net.URI;
 
 import org.springframework.ws.WebServiceMessage;
 
-import static org.springframework.ws.mock.support.Assert.assertEquals;
+import static org.springframework.ws.test.support.Assert.assertEquals;
 
 /**
  * Matches {@link URI}s.

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -27,7 +27,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.client.core.WebServiceTemplate;
-import org.springframework.ws.mock.support.PayloadDiffMatcher;
+import org.springframework.ws.test.support.PayloadDiffMatcher;
 import org.springframework.xml.transform.ResourceSource;
 import org.springframework.xml.validation.XmlValidator;
 import org.springframework.xml.validation.XmlValidatorFactory;
@@ -37,7 +37,7 @@ import org.springframework.xml.validation.XmlValidatorFactory;
  * WebServiceTemplate}, set up expectations on request messages, and create response messages.
  * <p/>
  * The typical usage of this mock is similar to any other mocking library (such as EasyMock), that is: <ol>
- * <li>Statically import {@link org.springframework.ws.mock.client.WebServiceMock org.springframework.ws.mock.client.WebServiceMock.*}.
+ * <li>Statically import {@link org.springframework.ws.test.client.WebServiceMock org.springframework.ws.mock.client.WebServiceMock.*}.
  * <li>Use the {@link #mockWebServiceTemplate(WebServiceTemplate)} method to mock a web service template. Typically,
  * this template is configured as a Spring bean, either explicitly or as a property of a class that extends {@link
  * org.springframework.ws.client.core.support.WebServiceGatewaySupport WebServiceGatewaySupport}.</li> <li>Set up

test/src/main/java/org/springframework/ws/test/client/XPathExpectations.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 /**
  * Allows for setting up expectations on XPath expressions.

test/src/main/java/org/springframework/ws/test/client/package-info.java

@@ -16,6 +16,6 @@
 
 /**
  * Provides a testing framework for client-side Web service testing. This package contains the
- * {@link org.springframework.ws.mock.client.WebServiceMock}, and various related test interfaces.
+ * {@link org.springframework.ws.test.client.WebServiceMock}, and various related test interfaces.
  */
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;

test/src/main/java/org/springframework/ws/test/server/AbstractRequestCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server;
+package org.springframework.ws.test.server;
 
 import java.io.IOException;
 

test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server;
+package org.springframework.ws.test.server;
 
 import java.io.IOException;
 import java.util.Map;
@@ -29,16 +29,16 @@ import org.springframework.ws.WebServiceMessage;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.context.DefaultMessageContext;
 import org.springframework.ws.context.MessageContext;
-import org.springframework.ws.mock.support.PayloadDiffMatcher;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.ws.soap.server.SoapMessageDispatcher;
+import org.springframework.ws.test.support.PayloadDiffMatcher;
 import org.springframework.ws.transport.WebServiceMessageReceiver;
 import org.springframework.xml.transform.ResourceSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import static org.springframework.ws.mock.support.Assert.fail;
+import static org.springframework.ws.test.support.Assert.fail;
 
 /**
  * @author Arjen Poutsma

test/src/main/java/org/springframework/ws/test/server/PayloadRequestCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server;
+package org.springframework.ws.test.server;
 
 import java.io.IOException;
 import javax.xml.transform.Source;
@@ -24,7 +24,7 @@ import org.springframework.ws.WebServiceMessage;
 import org.springframework.xml.transform.TransformerHelper;
 
 /**
- * Implementation of {@link org.springframework.ws.mock.client.ResponseCreator} that writes a {@link
+ * Implementation of {@link org.springframework.ws.test.client.ResponseCreator} that writes a {@link
  * javax.xml.transform.Source} response.
  *
  * @author Arjen Poutsma

test/src/main/java/org/springframework/ws/test/server/RequestCreator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server;
+package org.springframework.ws.test.server;
 
 import java.io.IOException;
 

test/src/main/java/org/springframework/ws/test/server/ResponseActions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server;
+package org.springframework.ws.test.server;
 
 import java.io.IOException;
 import javax.xml.transform.Source;

test/src/main/java/org/springframework/ws/test/server/ResponseMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server;
+package org.springframework.ws.test.server;
 
 import java.io.IOException;
 

test/src/main/java/org/springframework/ws/test/support/Assert.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.support;
+package org.springframework.ws.test.support;
 
 /**
  * JUnit independent assertion class.

test/src/main/java/org/springframework/ws/test/support/DiffMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.support;
+package org.springframework.ws.test.support;
 
 import java.io.IOException;
 
@@ -23,11 +23,11 @@ import org.springframework.ws.WebServiceMessage;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 
-import static org.springframework.ws.mock.support.Assert.assertTrue;
-import static org.springframework.ws.mock.support.Assert.fail;
+import static org.springframework.ws.test.support.Assert.assertTrue;
+import static org.springframework.ws.test.support.Assert.fail;
 
 /**
- * Implementation of {@link org.springframework.ws.mock.client.RequestMatcher} based on XMLUnit's {@link Diff}.
+ * Implementation of {@link org.springframework.ws.test.client.RequestMatcher} based on XMLUnit's {@link Diff}.
  *
  * @author Arjen Poutsma
  * @since 2.0

test/src/main/java/org/springframework/ws/test/support/PayloadDiffMatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.support;
+package org.springframework.ws.test.support;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.TransformerException;
@@ -27,7 +27,7 @@ import org.springframework.xml.transform.TransformerHelper;
 import org.custommonkey.xmlunit.Diff;
 import org.w3c.dom.Document;
 
-import static org.springframework.ws.mock.support.Assert.fail;
+import static org.springframework.ws.test.support.Assert.fail;
 
 /**
  * Matches {@link Source} payloads.

test/src/test/java/org/springframework/ws/test/client/DefaultXPathExpectationsTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.util.Collections;

test/src/test/java/org/springframework/ws/test/client/ErrorResponseCallbackTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 

test/src/test/java/org/springframework/ws/test/client/ExceptionResponseCallbackTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 

test/src/test/java/org/springframework/ws/test/client/MockSenderConnectionTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;

test/src/test/java/org/springframework/ws/test/client/SchemaValidatingRequestMatcherTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 

test/src/test/java/org/springframework/ws/test/client/SoapFaultResponseCallbackTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.util.Locale;

test/src/test/java/org/springframework/ws/test/client/SoapHeaderMatcherTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import javax.xml.namespace.QName;
 import javax.xml.soap.MessageFactory;

test/src/test/java/org/springframework/ws/test/client/UriMatcherTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.net.URI;
 

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client;
+package org.springframework.ws.test.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -45,7 +45,7 @@ import org.junit.Test;
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.springframework.ws.mock.client.WebServiceMock.*;
+import static org.springframework.ws.test.client.WebServiceMock.*;
 
 public class WebServiceMockTest {
 

test/src/test/java/org/springframework/ws/test/client/integration/ClientIntegrationTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.client.integration;
+package org.springframework.ws.test.client.integration;
 
 import javax.xml.transform.Source;
 
@@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.ws.client.core.WebServiceTemplate;
-import org.springframework.ws.mock.integration.CustomerCountRequest;
-import org.springframework.ws.mock.integration.CustomerCountResponse;
+import org.springframework.ws.test.integration.CustomerCountRequest;
+import org.springframework.ws.test.integration.CustomerCountResponse;
 import org.springframework.xml.transform.StringSource;
 
 import org.junit.Before;
@@ -31,7 +31,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertEquals;
-import static org.springframework.ws.mock.client.WebServiceMock.*;
+import static org.springframework.ws.test.client.WebServiceMock.*;
 
 /**
  * Integration test for client-side WebService testing. In different package so we can't use the package-protected

test/src/test/java/org/springframework/ws/test/integration/CustomerCountRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.integration;
+package org.springframework.ws.test.integration;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

test/src/test/java/org/springframework/ws/test/integration/CustomerCountResponse.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.integration;
+package org.springframework.ws.test.integration;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

test/src/test/java/org/springframework/ws/test/server/integration/CustomerEndpoint.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server.integration;
+package org.springframework.ws.test.server.integration;
 
-import org.springframework.ws.mock.integration.CustomerCountRequest;
-import org.springframework.ws.mock.integration.CustomerCountResponse;
 import org.springframework.ws.server.endpoint.annotation.Endpoint;
 import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
+import org.springframework.ws.test.integration.CustomerCountRequest;
+import org.springframework.ws.test.integration.CustomerCountResponse;
 
 @Endpoint
 public class CustomerEndpoint {

test/src/test/java/org/springframework/ws/test/server/integration/ServerIntegrationTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.server.integration;
+package org.springframework.ws.test.server.integration;
 
 import javax.xml.transform.Source;
 
@@ -22,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.ws.mock.server.MockWebServiceClient;
+import org.springframework.ws.test.server.MockWebServiceClient;
 import org.springframework.xml.transform.StringSource;
 
 import org.junit.Before;

test/src/test/java/org/springframework/ws/test/support/PayloadDiffMatcherTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.ws.mock.support;
+package org.springframework.ws.test.support;
 
 import javax.xml.soap.MessageFactory;
 

test/src/test/resources/org/springframework/ws/test/client/integration/integration-test.xml

@@ -12,8 +12,8 @@
     <bean id="marshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
         <property name="classesToBeBound">
             <list>
-                <value>org.springframework.ws.mock.integration.CustomerCountRequest</value>
-                <value>org.springframework.ws.mock.integration.CustomerCountResponse</value>
+                <value>org.springframework.ws.test.integration.CustomerCountRequest</value>
+                <value>org.springframework.ws.test.integration.CustomerCountResponse</value>
             </list>
         </property>
     </bean>

test/src/test/resources/org/springframework/ws/test/server/integration/integration-test.xml

@@ -5,13 +5,13 @@
 
     <bean class="org.springframework.ws.server.endpoint.mapping.jaxb.XmlRootElementEndpointMapping"/>
 
-    <bean class="org.springframework.ws.mock.server.integration.CustomerEndpoint"/>
+    <bean class="org.springframework.ws.test.server.integration.CustomerEndpoint"/>
 
     <bean id="marshaller" class="org.springframework.oxm.jaxb.Jaxb2Marshaller">
         <property name="classesToBeBound">
             <list>
-                <value>org.springframework.ws.mock.integration.CustomerCountRequest</value>
-                <value>org.springframework.ws.mock.integration.CustomerCountResponse</value>
+                <value>org.springframework.ws.test.integration.CustomerCountRequest</value>
+                <value>org.springframework.ws.test.integration.CustomerCountResponse</value>
             </list>
         </property>
     </bean>