Author: heiko.braun(a)jboss.com
Date: 2008-02-04 14:30:40 -0500 (Mon, 04 Feb 2008)
New Revision: 5562
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
Log:
Fix provider payload tests. Explicitly query element contents opposed to string
comparison
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java
===================================================================
---
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java 2008-02-04
17:24:30 UTC (rev 5561)
+++
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.java 2008-02-04
19:30:40 UTC (rev 5562)
@@ -23,9 +23,8 @@
// $Id$
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
+import org.jboss.wsf.common.DOMUtils;
+import org.w3c.dom.Element;
import javax.jws.HandlerChain;
import javax.xml.transform.OutputKeys;
@@ -34,13 +33,12 @@
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.*;
import javax.xml.ws.http.HTTPBinding;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
/**
* Test a Provider<Source>
@@ -69,9 +67,7 @@
transformer.transform(req, streamResult);
String xmlReq = streamResult.getOutputStream().toString();
- String expReq = "<ns1:somePayload
xmlns:ns1=\"http://org.jboss.ws/httpbinding\">Hello:InboundLogicalHandler</ns1:somePayload>";
- if (!expReq.equals(xmlReq))
- throw new WebServiceException("Unexpected payload: " + xmlReq);
+ verifyRequest(xmlReq);
return new StreamSource(new ByteArrayInputStream(xmlReq.getBytes()));
}
@@ -85,4 +81,16 @@
}
}
-}
\ No newline at end of file
+ private void verifyRequest(String xml) throws IOException
+ {
+ Element was = DOMUtils.parse(xml);
+
+ if(!"somePayload".equals(was.getLocalName())
+ || !"http://org.jboss.ws/httpbinding".equals(was.getNamespaceURI())
+ || !"Hello:InboundLogicalHandler".equals(
DOMUtils.getTextContent(was)))
+ {
+ throw new WebServiceException("Unexpected payload: " + xml);
+ }
+ }
+
+}
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java
===================================================================
---
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java 2008-02-04
17:24:30 UTC (rev 5561)
+++
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.java 2008-02-04
19:30:40 UTC (rev 5562)
@@ -23,9 +23,13 @@
// $Id$
+import org.w3c.dom.Element;
+import org.jboss.wsf.common.DOMUtils;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
+import java.io.IOException;
import javax.jws.HandlerChain;
import javax.xml.transform.OutputKeys;
@@ -63,9 +67,7 @@
transformer.transform(req, streamResult);
String xmlReq = streamResult.getOutputStream().toString();
- 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);
+ verifyRequest(xmlReq);
return new StreamSource(new ByteArrayInputStream(xmlReq.getBytes()));
}
@@ -79,4 +81,16 @@
}
}
-}
\ No newline at end of file
+ private void verifyRequest(String xml) throws IOException
+ {
+ Element was = DOMUtils.parse(xml);
+
+ if(!"somePayload".equals(was.getLocalName())
+ || !"http://org.jboss.ws/provider".equals(was.getNamespaceURI())
+ || !"Hello:Inbound:LogicalSourceHandler".equals(
DOMUtils.getTextContent(was)))
+ {
+ throw new WebServiceException("Unexpected payload: " + xml);
+ }
+}
+
+}
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java
===================================================================
---
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2008-02-04
17:24:30 UTC (rev 5561)
+++
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.java 2008-02-04
19:30:40 UTC (rev 5562)
@@ -24,6 +24,7 @@
// $Id$
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
@@ -39,6 +40,7 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
import javax.xml.ws.Service.Mode;
import javax.xml.ws.soap.SOAPBinding;
@@ -81,10 +83,21 @@
Dispatch<Source> dispatch = createDispatch("ProviderEndpoint");
Source resPayload = dispatch.invoke(new DOMSource(DOMUtils.parse(reqString)));
- Element docElement = DOMUtils.sourceToElement(resPayload);
- assertEquals(DOMUtils.parse(resString), docElement);
+ verifyResponse(resPayload);
}
+ private void verifyResponse(Source xml) throws IOException
+ {
+ Element was = DOMUtils.sourceToElement(xml);
+
+ if(!"somePayload".equals(was.getLocalName())
+ || !"http://org.jboss.ws/provider".equals(was.getNamespaceURI())
+ ||
!"Hello:Inbound:LogicalSourceHandler:Outbound:LogicalSourceHandler".equals(
DOMUtils.getTextContent(was)))
+ {
+ throw new WebServiceException("Unexpected payload: " + xml);
+ }
+ }
+
public void testProviderMessage() throws Exception
{
String reqEnvStr =
Show replies by date