Author: jason.greene(a)jboss.com Date: 2007-01-15 23:03:22 -0500 (Mon, 15 Jan 2007) New Revision: 1976 Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml Log: Fix JBWS1384TestCase Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-15 20:34:13 UTC (rev 1975) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/JBWS1384TestCase.java 2007-01-16 04:03:22 UTC (rev 1976) @@ -40,7 +40,7 @@ /** * Attachment parts with doclit message - * + * * http://jira.jboss.org/jira/browse/JBWS-1384 * * @author Thomas.Diesler(a)jboss.org @@ -76,15 +76,16 @@ boolean ret = wstools.generate("resources/jaxrpc/jbws1384/wstools-config.xml", "./wstools/jbws1384"); assertTrue("wstools success", ret); } - + public void testEndpoint() throws Exception { + /* StubExt stub = (StubExt)port; AttachmentPart part = stub.createAttachmentPart(); part.setContent("attached-string", "text/plain"); stub.addAttachmentPart(part); - - String retStr = port.invokeAttach("user", "pass", "op", "<root/>"); + */ + String retStr = port.invokeAttach("user", "pass", "op", "<root/>", "attached-string"); assertEquals("[user=user,pass=pass,op=op,xml=<root/>] attached-string", retStr); } } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-15 20:34:13 UTC (rev 1975) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TranslatorBean.java 2007-01-16 04:03:22 UTC (rev 1976) @@ -36,11 +36,11 @@ private ServletEndpointContext sepCtx; - public String invokeAttach(String username, String password, String operationName, String inputXML) + public String invokeAttach(String username, String password, String operationName, String inputXML, String attachmentContents) { String reqMessage = "[user=" + username + ",pass=" + password + ",op=" + operationName + ",xml=" + inputXML + "]"; - - // Get attached string + + // Verify parameter was actually an attachment String attachedStr = null; try { @@ -53,6 +53,9 @@ throw new RuntimeException(ex); } + if (attachedStr == null || !attachedStr.equals(attachmentContents)) + throw new IllegalStateException("Attachment strings do not match"); + log.info(reqMessage + " " + attachedStr); return reqMessage + " " + attachedStr; } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-15 20:34:13 UTC (rev 1975) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1384/TransmulatorInterface.java 2007-01-16 04:03:22 UTC (rev 1976) @@ -11,5 +11,5 @@ public interface TransmulatorInterface extends java.rmi.Remote { - public java.lang.String invokeAttach(java.lang.String username, java.lang.String password, java.lang.String operationName, java.lang.String inputXML) throws java.rmi.RemoteException; + public java.lang.String invokeAttach(java.lang.String username, java.lang.String password, java.lang.String operationName, java.lang.String inputXML, String attachmentContents) throws java.rmi.RemoteException; } Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-15 20:34:13 UTC (rev 1975) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/jbws1384/WEB-INF/jaxrpc-mapping.xml 2007-01-16 04:03:22 UTC (rev 1976) @@ -89,6 +89,15 @@ <parameter-mode>IN</parameter-mode> </wsdl-message-mapping> </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>4</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.webservice/samples2'>wsdlMsgNS:attachRequest</wsdl-message> + <wsdl-message-part-name>attachmentContents</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> <wsdl-return-value-mapping> <method-return-value>java.lang.String</method-return-value> <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.webservice/samples2'>wsdlMsgNS:attachResponse</wsdl-message> @@ -96,4 +105,4 @@ </wsdl-return-value-mapping> </service-endpoint-method-mapping> </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file +</java-wsdl-mapping>