Author: jason.greene(a)jboss.com Date: 2006-10-10 13:12:11 -0400 (Tue, 10 Oct 2006) New Revision: 1194 Added: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java Removed: trunk/src/test/resources/jaxws/jsr181/webservice/META-INF/ Modified: trunk/src/test/ant/build-jars-jaxws.xml trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceJSETestCase.java Log: Convert JSR-181 webservice test cases to use a JAX-WS client Modified: trunk/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/src/test/ant/build-jars-jaxws.xml 2006-10-10 16:20:55 UTC (rev 1193) +++ trunk/src/test/ant/build-jars-jaxws.xml 2006-10-10 17:12:11 UTC (rev 1194) @@ -266,17 +266,6 @@ <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/> </fileset> </jar> - <jar jarfile="${build.test.dir}/libs/jaxws-jsr181-webservice-client.jar"> - <fileset dir="${build.test.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/> - </fileset> - <metainf dir="${build.test.dir}/resources/jaxws/jsr181/webservice/META-INF"> - <include name="application-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> <!-- jaxws-logicalhandler --> <war warfile="${build.test.dir}/libs/jaxws-logicalhandler-source.war" webxml="${build.test.dir}/resources/jaxws/logicalhandler/WEB-INF/web-source.xml"> Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.java 2006-10-10 16:20:55 UTC (rev 1193) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.java 2006-10-10 17:12:11 UTC (rev 1194) @@ -24,6 +24,10 @@ import java.rmi.Remote; import java.rmi.RemoteException; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; +import javax.jws.soap.SOAPBinding.Style; + /** * Test the JSR-181 annotation: javax.jws.WebService * This interface is only used in the client deployment. @@ -31,6 +35,8 @@ * @author Thomas.Diesler(a)jboss.org * @since 29-Apr-2005 */ +@WebService +@SOAPBinding(style = Style.RPC) public interface EndpointInterface extends Remote { String echo(String input) throws RemoteException; Added: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java 2006-10-10 16:20:55 UTC (rev 1193) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java 2006-10-10 17:12:11 UTC (rev 1194) @@ -0,0 +1,91 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jsr181.webservice; + +import java.net.MalformedURLException; +import java.net.URL; +import java.rmi.RemoteException; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.metadata.wsdl.WSDLDefinitions; +import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; + +// $Id$ + +/** + * Base testing class for &#064;WebService + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class JSR181WebServiceBase extends JBossWSTest +{ + private static EndpointInterface port; + + private EndpointInterface getPort() throws MalformedURLException + { + if (port == null) + { + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "TestService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + port = (EndpointInterface)service.getPort(EndpointInterface.class); + } + + return port; + } + + private void sayHello() throws RemoteException, MalformedURLException + { + assertWSDLAccess(); + String helloWorld = "Hello world!"; + Object retObj = getPort().echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void testWebService() throws Exception + { + sayHello(); + } + + public void testWebServiceWsdlLocation() throws Exception + { + sayHello(); + } + + public void testWebServiceEndpointInterface() throws Exception + { + sayHello(); + } + + private void assertWSDLAccess() throws MalformedURLException + { + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); + WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); + WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); + assertNotNull(wsdlDefinitions); + } +} \ No newline at end of file Property changes on: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceBase.java ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2006-10-10 16:20:55 UTC (rev 1193) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB21TestCase.java 2006-10-10 17:12:11 UTC (rev 1194) @@ -37,38 +37,22 @@ * Test the JSR-181 annotation: javax.jws.WebService * * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @since 29-Apr-2005 */ -public class JSR181WebServiceEJB21TestCase extends JBossWSTest +public class JSR181WebServiceEJB21TestCase extends JSR181WebServiceBase { - private static EndpointInterface port; - public static Test suite() { - return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB21TestCase.class, "jaxws-jsr181-webservice-client.jar"); + return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB21TestCase.class, ""); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (EndpointInterface)service.getPort(EndpointInterface.class); - } - } - public void testWebService() throws Exception { deploy("jaxws-jsr181-webservice01.jar"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebService(); } finally { @@ -81,11 +65,7 @@ deploy("jaxws-jsr181-webservice02.jar"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebServiceWsdlLocation(); } finally { @@ -98,23 +78,11 @@ deploy("jaxws-jsr181-webservice03.jar"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebServiceEndpointInterface(); } finally { undeploy("jaxws-jsr181-webservice03.jar"); } } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java 2006-10-10 16:20:55 UTC (rev 1193) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.java 2006-10-10 17:12:11 UTC (rev 1194) @@ -21,45 +21,26 @@ */ package org.jboss.test.ws.jaxws.jsr181.webservice; -import java.net.MalformedURLException; -import java.net.URL; - import javax.naming.InitialContext; -import javax.xml.rpc.Service; import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; /** * Test the JSR-181 annotation: javax.jws.WebService * * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @since 29-Apr-2005 */ -public class JSR181WebServiceEJB3TestCase extends JBossWSTest +public class JSR181WebServiceEJB3TestCase extends JSR181WebServiceBase { - private static EndpointInterface port; - public static Test suite() { - return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB3TestCase.class, "jaxws-jsr181-webservice-client.jar"); + return JBossWSTestSetup.newTestSetup(JSR181WebServiceEJB3TestCase.class, ""); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (EndpointInterface)service.getPort(EndpointInterface.class); - } - } - public void testRemoteAccess() throws Exception { deploy("jaxws-jsr181-webservice01.ejb3"); @@ -83,11 +64,7 @@ deploy("jaxws-jsr181-webservice01.ejb3"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebService(); } finally { @@ -100,11 +77,7 @@ deploy("jaxws-jsr181-webservice02.ejb3"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebServiceWsdlLocation(); } finally { @@ -117,23 +90,11 @@ deploy("jaxws-jsr181-webservice03.ejb3"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebServiceEndpointInterface(); } finally { undeploy("jaxws-jsr181-webservice03.ejb3"); } } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } } Modified: trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceJSETestCase.java =================================================================== --- trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceJSETestCase.java 2006-10-10 16:20:55 UTC (rev 1193) +++ trunk/src/test/java/org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceJSETestCase.java 2006-10-10 17:12:11 UTC (rev 1194) @@ -21,55 +21,30 @@ */ package org.jboss.test.ws.jaxws.jsr181.webservice; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - import junit.framework.Test; -import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.metadata.wsdl.WSDLDefinitions; -import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory; /** * Test the JSR-181 annotation: javax.jws.WebService * * @author Thomas.Diesler(a)jboss.org + * @author <a href=&quot;jason.greene(a)jboss.com&quot;&gt;Jason T. Greene</a> * @since 29-Apr-2005 */ -public class JSR181WebServiceJSETestCase extends JBossWSTest +public class JSR181WebServiceJSETestCase extends JSR181WebServiceBase { - private static EndpointInterface port; - public static Test suite() { - return JBossWSTestSetup.newTestSetup(JSR181WebServiceJSETestCase.class, "jaxws-jsr181-webservice-client.jar"); + return JBossWSTestSetup.newTestSetup(JSR181WebServiceJSETestCase.class, ""); } - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (EndpointInterface)service.getPort(EndpointInterface.class); - } - } - public void testWebService() throws Exception { deploy("jaxws-jsr181-webservice01.war"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebService(); } finally { @@ -82,11 +57,7 @@ deploy("jaxws-jsr181-webservice02.war"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebServiceWsdlLocation(); } finally { @@ -99,23 +70,11 @@ deploy("jaxws-jsr181-webservice03.war"); try { - assertWSDLAccess(); - - String helloWorld = "Hello world!"; - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); + super.testWebServiceEndpointInterface(); } finally { undeploy("jaxws-jsr181-webservice03.war"); } } - - private void assertWSDLAccess() throws MalformedURLException - { - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jsr181?wsdl"); - WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance(); - WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL); - assertNotNull(wsdlDefinitions); - } }