[jboss-svn-commits] JBossWS SVN: r1040 - in branches/hbraun/jbossws-1.0/src/test: java/org/jboss/test/ws/jaxrpc/xop/doclit resources/jaxrpc/xop/doclit/WEB-INF resources/jaxrpc/xop/doclit/WEB-INF/wsdl resources/jaxrpc/xop/doclit/handlerconfig/META-INF resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 25 10:26:16 EDT 2006
Author: heiko.braun at jboss.com
Date: 2006-09-25 10:26:07 -0400 (Mon, 25 Sep 2006)
New Revision: 1040
Modified:
branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java
branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java
branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml
branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl
branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml
Log:
separate MTOM test cases for doc/lit and rpc/lit
Modified: branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestServiceImpl.java 2006-09-25 14:26:07 UTC (rev 1040)
@@ -3,6 +3,8 @@
import org.jboss.ws.soap.MessageContextAssociation;
import org.jboss.ws.common.CommonMessageContext;
import org.jboss.ws.jaxrpc.StubExt;
+import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
import java.rmi.RemoteException;
import java.util.StringTokenizer;
Modified: branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/TestService_PortType.java 2006-09-25 14:26:07 UTC (rev 1040)
@@ -7,5 +7,5 @@
package org.jboss.test.ws.jaxrpc.xop.doclit;
public interface TestService_PortType extends java.rmi.Remote
{
- public org.jboss.test.ws.jaxrpc.xop.doclit.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.doclit.PingMsg pingMsg) throws java.rmi.RemoteException;
+ public org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse ping(org.jboss.test.ws.jaxrpc.xop.shared.PingMsg pingMsg) throws java.rmi.RemoteException;
}
Modified: branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2006-09-25 14:26:07 UTC (rev 1040)
@@ -25,6 +25,8 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
import org.jboss.ws.utils.IOUtils;
import org.jboss.ws.jaxrpc.StubExt;
@@ -39,10 +41,8 @@
* @version $Id$
* @since Sep 22, 2006
*/
-public class XOPHandlerTestCase extends JBossWSTest {
+public class XOPHandlerTestCase extends XOPBase {
- private static TestService_PortType port;
-
public static Test suite()
{
return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar");
@@ -60,54 +60,4 @@
((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler");
}
-
- public void testRequestResponseOptimizedHandler() throws Exception {
-
- System.out.println("FIXME: JBWS-1169");
-
- /*
- DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
- ByteArrayOutputStream bout = new ByteArrayOutputStream();
- dh.writeTo(bout);
-
- byte[] imageBytes = bout.toByteArray();
- String expected = SimpleTypeBindings.marshalBase64(imageBytes);
- String was = (String)((Stub) port)._getProperty("xop.inline.value");
- assertNotNull("base64 value not found", was);
- assertEquals(expected, was);
- */
- }
-
- public void testRequestResponseOptimized() throws Exception {
-
- DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
- PingMsgResponse value = port.ping(new PingMsg("1|1", IOUtils.convertToBytes(dh)));
- assertNotNull("Return value was null", value);
- assertNotNull("Returned xopContent was null", value.getXopContent());
- }
-
- public void testResponseOptimized() throws Exception {
-
- byte[] bytes = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
-
- // disable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
-
- PingMsgResponse value = port.ping(new PingMsg("0|1", bytes));
- assertNotNull("Return value was null",value);
- assertNotNull("Return xopContent was null", value.getXopContent());
- }
-
- public void testRequestOptimized() throws Exception {
-
- byte[] bytes = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
-
- // reusing the stub means cleaning the previous state
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
-
- PingMsgResponse value = port.ping(new PingMsg("1|0", bytes));
- assertNotNull("Return value was null",value);
- assertNotNull("Return xopContent was null", value.getXopContent());
- }
-
}
Modified: branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2006-09-25 14:26:07 UTC (rev 1040)
@@ -27,6 +27,8 @@
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport;
+import org.jboss.test.ws.jaxrpc.xop.shared.PingMsg;
+import org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse;
import org.jboss.ws.jaxrpc.StubExt;
import org.jboss.ws.utils.IOUtils;
@@ -41,9 +43,7 @@
* @author Heiko.Braun at jboss.org
* @since 11-Nov-2005
*/
-public class XOPTestCase extends JBossWSTest
-{
- private static TestService_PortType port;
+public class XOPTestCase extends XOPBase {
public static Test suite()
{
@@ -63,36 +63,4 @@
((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit");
}
- public void testRequestResponseOptimized() throws Exception {
-
- DataHandler dh = new DataHandler("Another plain text attachment", "text/plain");
- PingMsgResponse value = port.ping(new PingMsg("1|1", IOUtils.convertToBytes(dh)));
- assertNotNull("Return value was null", value);
- assertNotNull("Returned xopContent was null", value.getXopContent());
- }
-
- public void testResponseOptimized() throws Exception {
-
- byte[] bytes = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
-
- // disable MTOM
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE);
-
- PingMsgResponse value = port.ping(new PingMsg("0|1", bytes));
- assertNotNull("Return value was null",value);
- assertNotNull("Return xopContent was null", value.getXopContent());
- }
-
- public void testRequestOptimized() throws Exception {
-
- byte[] bytes = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/samples/mtom/attach.jpeg"));
-
- // reusing the stub means cleaning the previous state
- ((Stub)port)._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE);
-
- PingMsgResponse value = port.ping(new PingMsg("1|0", bytes));
- assertNotNull("Return value was null",value);
- assertNotNull("Return xopContent was null", value.getXopContent());
- }
-
}
Modified: branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/jaxrpc-mapping.xml 2006-09-25 14:26:07 UTC (rev 1040)
@@ -5,7 +5,7 @@
</package-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.doclit.PingMsg</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingMsg</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -19,7 +19,7 @@
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.xop.doclit.PingMsgResponse</java-type>
+ <java-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</java-type>
<anonymous-type-qname xmlns:typeNS='http://jboss.org/test/ws/xop/doclit'>typeNS:>PingMsgResponse</anonymous-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -46,7 +46,7 @@
<wsdl-operation>ping</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.xop.doclit.PingMsg</param-type>
+ <param-type>org.jboss.test.ws.jaxrpc.xop.shared.PingMsg</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingIn</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -54,7 +54,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.xop.doclit.PingMsgResponse</method-return-value>
+ <method-return-value>org.jboss.test.ws.jaxrpc.xop.shared.PingMsgResponse</method-return-value>
<wsdl-message xmlns:wsdlMsgNS='http://jboss.org/test/ws/xop/doclit'>wsdlMsgNS:PingOut</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
</wsdl-return-value-mapping>
Modified: branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/WEB-INF/wsdl/TestService.wsdl 2006-09-25 14:26:07 UTC (rev 1040)
@@ -48,7 +48,7 @@
<operation name="ping">
<input message="s0:PingIn" />
<output message="s0:PingOut" />
- </operation>
+ </operation>
</portType>
<binding name="TestServiceBinding" type="s0:TestService">
Modified: branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/application-client.xml 2006-09-25 14:26:07 UTC (rev 1040)
@@ -17,7 +17,7 @@
</port-component-ref>
<handler>
<handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.xop.shared.InlineHandler</handler-class>
</handler>
</service-ref>
Modified: branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml
===================================================================
--- branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2006-09-25 14:25:41 UTC (rev 1039)
+++ branches/hbraun/jbossws-1.0/src/test/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF/webservices.xml 2006-09-25 14:26:07 UTC (rev 1040)
@@ -16,7 +16,7 @@
<service-endpoint-interface>org.jboss.test.ws.jaxrpc.xop.doclit.TestService_PortType</service-endpoint-interface>
<handler>
<handler-name>XOPInlineHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.xop.doclit.InlineHandler</handler-class>
+ <handler-class>org.jboss.test.ws.jaxrpc.xop.shared.InlineHandler</handler-class>
</handler>
<service-impl-bean>
<servlet-link>TestService</servlet-link>
More information about the jboss-svn-commits
mailing list