polishing

This commit is contained in:
Arjen Poutsma
2010-09-21 09:48:14 +00:00
parent d1d4620b93
commit 920309cfc5
2 changed files with 51 additions and 45 deletions

View File

@@ -16,8 +16,9 @@
package org.springframework.ws.soap.server.endpoint.adapter.method;
import org.junit.Before;
import org.junit.Test;
import java.util.List;
import javax.xml.namespace.QName;
import org.springframework.core.MethodParameter;
import org.springframework.ws.context.MessageContext;
import org.springframework.ws.server.endpoint.adapter.method.AbstractMethodArgumentResolverTestCase;
@@ -25,8 +26,8 @@ import org.springframework.ws.soap.SoapHeaderElement;
import org.springframework.ws.soap.SoapMessage;
import org.springframework.ws.soap.server.endpoint.annotation.SoapHeader;
import javax.xml.namespace.QName;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -62,17 +63,23 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA
SoapHeaderElement element = message.getSoapHeader().addHeaderElement(HEADER_QNAME);
element.setText(HEADER_CONTENT + i);
}
soapHeaderWithEmptyValue = new MethodParameter(getClass().getMethod("soapHeaderWithEmptyValue", SoapHeaderElement.class), 0);
soapHeaderElementParameter = new MethodParameter(getClass().getMethod("soapHeaderElement", SoapHeaderElement.class), 0);
soapHeaderElementListParameter = new MethodParameter(getClass().getMethod("soapHeaderElementList", List.class), 0);
soapHeaderMismatch = new MethodParameter(getClass().getMethod("soapHeaderMismatch", SoapHeaderElement.class), 0);
soapHeaderWithEmptyValue =
new MethodParameter(getClass().getMethod("soapHeaderWithEmptyValue", SoapHeaderElement.class), 0);
soapHeaderElementParameter =
new MethodParameter(getClass().getMethod("soapHeaderElement", SoapHeaderElement.class), 0);
soapHeaderElementListParameter =
new MethodParameter(getClass().getMethod("soapHeaderElementList", List.class), 0);
soapHeaderMismatch =
new MethodParameter(getClass().getMethod("soapHeaderMismatch", SoapHeaderElement.class), 0);
soapHeaderMismatchList = new MethodParameter(getClass().getMethod("soapHeaderMismatchList", List.class), 0);
}
@Test
public void supportsParameter() throws Exception {
assertTrue("resolver does not support soapHeaderElement", resolver.supportsParameter(soapHeaderElementParameter));
assertTrue("resolver does not support List<soapHeaderElement>", resolver.supportsParameter(soapHeaderElementListParameter));
assertTrue("resolver does not support soapHeaderElement",
resolver.supportsParameter(soapHeaderElementParameter));
assertTrue("resolver does not support List<soapHeaderElement>",
resolver.supportsParameter(soapHeaderElementListParameter));
}
@Test(expected = IllegalArgumentException.class)
@@ -92,8 +99,8 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA
assertEquals("header text must be equal to [" + HEADER_CONTENT + "0]", HEADER_CONTENT + "0", element.getText());
}
@Test
@SuppressWarnings("unchecked")
public void resolveSoapHeaderElementList() throws Exception {
Object result = resolver.resolveArgument(messageContext, soapHeaderElementListParameter);
@@ -105,7 +112,8 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA
for (int i = 0; i < elements.size(); i++) {
SoapHeaderElement element = elements.get(i);
assertTrue("headers must be equal", element.getName().equals(HEADER_QNAME));
assertEquals("header must be equal to [" + HEADER_CONTENT + i + "]", HEADER_CONTENT + i, elements.get(i).getText());
assertEquals("header must be equal to [" + HEADER_CONTENT + i + "]", HEADER_CONTENT + i,
elements.get(i).getText());
}
}
@@ -122,20 +130,21 @@ public class SoapHeaderElementMethodArgumentResolverTest extends AbstractMethodA
assertTrue("result List must be empty", ((List) result).isEmpty());
}
public void soapHeaderWithEmptyValue(@SoapHeader("") SoapHeaderElement element) {
}
public void soapHeaderElement(@SoapHeader("{http://springframework.org/ws}header") SoapHeaderElement element) {
}
public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List<SoapHeaderElement> elements) {
public void soapHeaderElementList(@SoapHeader(
"{http://springframework.org/ws}header") List<SoapHeaderElement> elements) {
}
public void soapHeaderMismatch(@SoapHeader("{http://springframework.org/ws}xxx") SoapHeaderElement element) {
}
public void soapHeaderMismatchList(@SoapHeader("{http://springframework.org/ws}xxx") List<SoapHeaderElement> elements) {
public void soapHeaderMismatchList(@SoapHeader(
"{http://springframework.org/ws}xxx") List<SoapHeaderElement> elements) {
}