[jbossws-commits] JBossWS SVN: r3359 - in trunk: testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 1 07:35:45 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-01 07:35:44 -0400 (Fri, 01 Jun 2007)
New Revision: 3359
Modified:
trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
Log:
Enable sunri provider
Modified: trunk/integration/sunri/src/test/resources/excludes-jboss50.txt
===================================================================
--- trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 11:13:38 UTC (rev 3358)
+++ trunk/integration/sunri/src/test/resources/excludes-jboss50.txt 2007-06-01 11:35:44 UTC (rev 3359)
@@ -8,7 +8,7 @@
# [JBWS-1673] Fix JAXR samples for SunRI
org/jboss/test/ws/jaxws/samples/jaxr/**
-org/jboss/test/ws/jaxws/samples/provider/**
+#org/jboss/test/ws/jaxws/samples/provider/**
org/jboss/test/ws/jaxws/samples/retail/**
org/jboss/test/ws/jaxws/samples/soapbinding/**
org/jboss/test/ws/jaxws/samples/swaref/**
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-06-01 11:13:38 UTC (rev 3358)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.java 2007-06-01 11:35:44 UTC (rev 3359)
@@ -77,7 +77,7 @@
Element root = DOMUtils.parse(new ByteArrayInputStream(baos.toByteArray()));
String oldValue = DOMUtils.getTextContent(root);
- String newValue = oldValue + ":" + direction + getHandlerName();
+ String newValue = oldValue + ":" + direction + ":LogicalSourceHandler";
root.setTextContent(newValue);
log.debug("oldValue: " + oldValue);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java 2007-06-01 11:13:38 UTC (rev 3358)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.java 2007-06-01 11:35:44 UTC (rev 3359)
@@ -41,11 +41,7 @@
* @author <a href="jason.greene at jboss.com"/>Jason T. Greene</a>
* @since 29-Jun-2006
*/
- at WebServiceProvider(
- serviceName = "ProviderService",
- portName = "ProviderPort",
- targetNamespace = "http://org.jboss.ws/provider",
- wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
+ at WebServiceProvider(serviceName = "ProviderService", portName = "ProviderPort", targetNamespace = "http://org.jboss.ws/provider", wsdlLocation = "WEB-INF/wsdl/Provider.wsdl")
@ServiceMode(value = Service.Mode.PAYLOAD)
public class ProviderBeanJAXB implements Provider<Source>
{
@@ -56,7 +52,7 @@
{
try
{
- JAXBContext jc = JAXBContext.newInstance(new Class[] {UserType.class});
+ JAXBContext jc = JAXBContext.newInstance(new Class[] { UserType.class });
UserType user = (UserType)jc.createUnmarshaller().unmarshal(request);
log.info("[string=" + user.getString() + ",qname=" + user.getQname() + "]");
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java 2007-06-01 11:13:38 UTC (rev 3358)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java 2007-06-01 11:35:44 UTC (rev 3359)
@@ -63,7 +63,7 @@
transformer.transform(req, streamResult);
String xmlReq = streamResult.getOutputStream().toString();
- String expReq = "<ns1:somePayload xmlns:ns1=\"http://org.jboss.ws/provider\">Hello:InboundLogicalHandler</ns1:somePayload>";
+ String expReq = "<ns1:somePayload xmlns:ns1=\"http://org.jboss.ws/provider\">Hello:Inbound:LogicalSourceHandler</ns1:somePayload>";
if (!expReq.equals(xmlReq))
throw new WebServiceException("Unexpected payload: " + xmlReq);
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-06-01 11:13:38 UTC (rev 3358)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderMessageTestCase.java 2007-06-01 11:35:44 UTC (rev 3359)
@@ -35,6 +35,7 @@
import javax.xml.soap.SOAPConnectionFactory;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPHeader;
import javax.xml.soap.SOAPMessage;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
@@ -58,7 +59,6 @@
{
private String msgString =
"<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
" <env:Body>" +
" <ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'/>" +
" </env:Body>" +
@@ -84,23 +84,13 @@
SOAPMessage resMsg = dispatch.invoke(reqMsg);
SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
+ SOAPHeader soapHeader = resEnv.getHeader();
+ if (soapHeader != null)
+ soapHeader.detachNode();
+
assertEquals(DOMUtils.parse(msgString), resEnv);
}
- private Dispatch<SOAPMessage> createDispatch(String target) throws MalformedURLException, JAXBException
- {
- String targetNS = "http://org.jboss.ws/provider";
- QName serviceName = new QName(targetNS, "ProviderService");
- QName portName = new QName(targetNS, "ProviderPort");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-message/" + target + "?wsdl");
-
- Service service = Service.create(serviceName);
- service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm());
-
- Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE);
- return dispatch;
- }
-
public void testProviderMessage() throws Exception
{
SOAPMessage reqMsg = getRequestMessage();
@@ -111,6 +101,10 @@
SOAPMessage resMsg = con.call(reqMsg, epURL);
SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
+ SOAPHeader soapHeader = resEnv.getHeader();
+ if (soapHeader != null)
+ soapHeader.detachNode();
+
assertEquals(reqEnv, resEnv);
}
@@ -120,4 +114,18 @@
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(msgString.getBytes()));
return reqMsg;
}
+
+ private Dispatch<SOAPMessage> createDispatch(String target) throws MalformedURLException, JAXBException
+ {
+ String targetNS = "http://org.jboss.ws/provider";
+ QName serviceName = new QName(targetNS, "ProviderService");
+ QName portName = new QName(targetNS, "ProviderPort");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-samples-provider-message/" + target + "?wsdl");
+
+ Service service = Service.create(serviceName);
+ service.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, wsdlURL.toExternalForm());
+
+ Dispatch<SOAPMessage> dispatch = service.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE);
+ return dispatch;
+ }
}
Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-06-01 11:13:38 UTC (rev 3358)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2007-06-01 11:35:44 UTC (rev 3359)
@@ -47,6 +47,7 @@
import org.jboss.wsf.spi.test.JBossWSTest;
import org.jboss.wsf.spi.test.JBossWSTestSetup;
import org.jboss.wsf.spi.utils.DOMUtils;
+import org.jboss.wsf.spi.utils.DOMWriter;
import org.w3c.dom.Element;
/**
@@ -61,7 +62,7 @@
"<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello</ns1:somePayload>";
private String resString =
- "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello:InboundLogicalHandler:OutboundLogicalHandler</ns1:somePayload>";
+ "<ns1:somePayload xmlns:ns1='http://org.jboss.ws/provider'>Hello:Inbound:LogicalSourceHandler:Outbound:LogicalSourceHandler</ns1:somePayload>";
public static Test suite()
{
@@ -91,12 +92,6 @@
" <env:Body>" + reqString + "</env:Body>" +
"</env:Envelope>";
- String resEnvString =
- "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
- " <env:Header/>" +
- " <env:Body>" + resString + "</env:Body>" +
- "</env:Envelope>";
-
MessageFactory msgFactory = MessageFactory.newInstance();
SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnvStr.getBytes()));
@@ -105,7 +100,12 @@
SOAPMessage resMsg = con.call(reqMsg, epURL);
SOAPEnvelope resEnv = resMsg.getSOAPPart().getEnvelope();
- assertEquals(DOMUtils.parse(resEnvString), resEnv);
+ SOAPHeader soapHeader = resEnv.getHeader();
+ if (soapHeader != null)
+ soapHeader.detachNode();
+
+ String resEnvStr = DOMWriter.printNode(resEnv, false);
+ assertTrue("Expected payload: " + resString, resEnvStr.indexOf(resString) > 0);
}
private Dispatch<Source> createDispatch(String target) throws MalformedURLException, JAXBException
More information about the jbossws-commits
mailing list