[jbossws-commits] JBossWS SVN: r11789 - in framework/trunk/testsuite/test: resources/jaxws/smoke/tools/wsdl and 1 other directory.

Author: alessio.soldano(a)jboss.com Date: 2010-03-16 12:34:46 -0400 (Tue, 16 Mar 2010) New Revision: 11789 Added: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceImplicitHeader.wsdl Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java Log: [JBWS-2793] WSConsume support for implicit header Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-16 16:33:53 UTC (rev 11788) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2010-03-16 16:34:46 UTC (rev 11789) @@ -242,7 +242,7 @@ if (getIsCXF()) { - assertTrue("Tools output not correctly redirected", messageOut.indexOf("wsdl2java -p org.jboss.test.ws.tools.testMessageStream") != -1); + assertTrue("Tools output not correctly redirected", messageOut.indexOf("wsdl2java -exsh false -p org.jboss.test.ws.tools.testMessageStream") != -1); } else { @@ -327,6 +327,27 @@ File service = new File(outputDirectory, "org/jboss/test/ws/tools/testSOAP12Extension/TestService.java"); assertTrue("Service not generated", service.exists()); } + + public void testAdditionalHeaders() throws Exception + { + consumer.setTargetPackage("org.jboss.test.ws.tools.testAdditionalHeaders1"); + consumer.setAdditionalHeaders(false); + consumer.setNoCompile(false); + consumeWSDL(); + ClassLoader loader = getArtefactClassLoader(); + Class<?> sei = loader.loadClass("org.jboss.test.ws.tools.testAdditionalHeaders1.EndpointInterface"); + Method m = (sei.getMethods())[0]; + assertEquals(1, m.getParameterTypes().length); + consumer.setOutputDirectory(outputDirectory); + consumer.setTargetPackage("org.jboss.test.ws.tools.testAdditionalHeaders2"); + consumer.setAdditionalHeaders(true); + consumer.setNoCompile(false); + consumer.consume(getResourceFile("jaxws/smoke/tools/wsdl/TestServiceImplicitHeader.wsdl").getCanonicalPath()); + loader = getArtefactClassLoader(); + sei = loader.loadClass("org.jboss.test.ws.tools.testAdditionalHeaders2.EndpointInterface"); + m = (sei.getMethods())[0]; + assertEquals(2, m.getParameterTypes().length); + } private void consumeWSDL() throws Exception { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java 2010-03-16 16:33:53 UTC (rev 11788) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPluginDelegate.java 2010-03-16 16:34:46 UTC (rev 11789) @@ -47,4 +47,6 @@ void testTarget() throws Exception; void testSOAP12Extension() throws Exception; + + void testAdditionalHeaders() throws Exception; } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2010-03-16 16:33:53 UTC (rev 11788) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2010-03-16 16:34:46 UTC (rev 11789) @@ -160,6 +160,14 @@ dispatch("testSOAP12Extension"); } + /** + * Test the implicit header generation support + */ + public void testAdditionalHeaders() throws Exception + { + dispatch("testAdditionalHeaders"); + } + protected boolean filtered(String jarName) { return false; Added: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceImplicitHeader.wsdl =================================================================== --- framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceImplicitHeader.wsdl (rev 0) +++ framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceImplicitHeader.wsdl 2010-03-16 16:34:46 UTC (rev 11789) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<definitions name="TestService" + targetNamespace="http://www.openuri.org/2004/04/HelloWorld" + xmlns:tns="http://www.openuri.org/2004/04/HelloWorld" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:foons="http://foo.bar.com/test" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types> + <xs:schema targetNamespace='http://foo.bar.com/test' version='1.0' xmlns:tns='http://foo.bar.com/test' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:complexType name="foo"> + <xs:sequence> + <xs:element name="arg0" type="xs:int"/> + <xs:element name="arg1" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:element name="Foo" type="tns:foo"/> + </xs:schema> + </types> + <message name="EndpointInterface_echo"> + <part name="String_1" type="xsd:string"/> + </message> + <message name="EndpointInterface_echoResponse"> + <part name="result" type="xsd:string"/> + </message> + <message name="additionalHeader"> + <part name="additionalHeader" element="foons:Foo"/> + </message> + <portType name="EndpointInterface"> + <operation name="echo" parameterOrder="String_1"> + <input message="tns:EndpointInterface_echo"/> + <output message="tns:EndpointInterface_echoResponse"/> + </operation> + </portType> + <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + <soap:header message="tns:additionalHeader" part="additionalHeader"/> + </input> + <output> + <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/> + </output> + </operation> + </binding> + <service name="TestService"> + <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding"> + <soap:address location="REPLACE_WITH_ACTUAL_URL"/> + </port> + </service> +</definitions> Property changes on: framework/trunk/testsuite/test/resources/jaxws/smoke/tools/wsdl/TestServiceImplicitHeader.wsdl ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF