Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-632 - added as request messages as ResponseMatcher.match parameter

Browse Source
This commit is contained in:
Arjen Poutsma
2010-11-03 11:03:04 +00:00
parent fd3e7ead0b
commit bc95a2c81f
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java
View File

@@ -198,13 +198,14 @@ public class MockWebServiceClient {
}
public ResponseActions andExpect(ResponseMatcher responseMatcher) {
WebServiceMessage request = messageContext.getRequest();
WebServiceMessage response = messageContext.getResponse();
if (response == null) {
fail("No response received");
return null;
}
try {
responseMatcher.match(response);
responseMatcher.match(request, response);
return this;
}
catch (IOException ex) {

5
test/src/main/java/org/springframework/ws/test/server/ResponseMatcher.java
View File

@@ -33,10 +33,11 @@ public interface ResponseMatcher {
* Matches the given response message against the expectations. Implementations typically make use of JUnit-based
* assertions.
*
* @param response the request message to make assertions on
* @param response the request message
* @param response the response message to make assertions on
* @throws IOException in case of I/O errors
* @throws AssertionError if expectations are not met
*/
void match(WebServiceMessage response) throws IOException, AssertionError;
void match(WebServiceMessage request, WebServiceMessage response) throws IOException, AssertionError;
}

17
test/src/main/java/org/springframework/ws/test/server/ResponseMatchers.java
View File

@@ -52,7 +52,8 @@ public abstract class ResponseMatchers {
*/
public static ResponseMatcher anything() {
return new ResponseMatcher() {
public void match(WebServiceMessage response) {
public void match(WebServiceMessage request, WebServiceMessage response)
throws IOException, AssertionError {
}
};
}
@@ -68,7 +69,8 @@ public abstract class ResponseMatchers {
public static ResponseMatcher payload(Source payload) {
final PayloadDiffMatcher matcher = new PayloadDiffMatcher(payload);
return new ResponseMatcher() {
public void match(WebServiceMessage response) throws IOException {
public void match(WebServiceMessage request, WebServiceMessage response)
throws IOException, AssertionError {
matcher.match(response);
}
};
@@ -94,7 +96,7 @@ public abstract class ResponseMatchers {
public static ResponseMatcher noFault() {
return new SoapResponseMatcher() {
@Override
protected void match(SoapMessage response) throws IOException, AssertionError {
protected void matchSoap(SoapMessage request, 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());
@@ -205,12 +207,13 @@ public abstract class ResponseMatchers {
private static abstract class SoapResponseMatcher implements ResponseMatcher {
public final void match(WebServiceMessage response) throws IOException, AssertionError {
public final void match(WebServiceMessage request, WebServiceMessage response) throws IOException, AssertionError {
assertTrue("Request is not a SOAP message", request instanceof SoapMessage);
assertTrue("Response is not a SOAP message", response instanceof SoapMessage);
match((SoapMessage) response);
matchSoap((SoapMessage)request, (SoapMessage) response);
}
protected abstract void match(SoapMessage response) throws IOException, AssertionError;
protected abstract void matchSoap(SoapMessage request, SoapMessage response) throws IOException, AssertionError;
}
private static abstract class SoapFaultResponseMatcher extends SoapResponseMatcher {
@@ -222,7 +225,7 @@ public abstract class ResponseMatchers {
}
@Override
protected void match(SoapMessage response) throws IOException, AssertionError {
protected void matchSoap(SoapMessage request, SoapMessage response) throws IOException, AssertionError {
SoapBody responseBody = response.getSoapBody();
assertTrue("Response has no SOAP Body", responseBody != null);
assertTrue("Response has no SOAP Fault", responseBody.hasFault());