Author: alessio.soldano(a)jboss.com Date: 2010-06-11 16:47:39 -0400 (Fri, 11 Jun 2010) New Revision: 12473 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml Log: [JBWS-3060] Adding testcase Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-11 20:44:33 UTC (rev 12472) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2010-06-11 20:47:39 UTC (rev 12473) @@ -96,6 +96,14 @@ <include name="**/*" /> </metainf> </jar> + + <!-- jaxws-cxf-jbws3060 --> + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3060.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.class"/> + </fileset> + </jar> <!-- jaxws-cxf-management --> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-management.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/management/WEB-INF/web.xml"> Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java 2010-06-11 20:47:39 UTC (rev 12473) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060; + +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointOne +{ + String echo(String input); + + @Oneway + void echoOneWay(String input); + + int getCount(); +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOne.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java 2010-06-11 20:47:39 UTC (rev 12473) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060; + +import javax.ejb.Stateless; +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(name = "EndpointOne", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceOne") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@Stateless +public class EndpointOneImpl +{ + private volatile static int count = 0; + + @WebMethod + public String echo(String input) + { + Logger.getLogger(this.getClass()).info("echo: " + input); + count++; + return input; + } + + @WebMethod + @Oneway + public void echoOneWay(String input) + { + Logger.getLogger(this.getClass()).info("echoOneWay: " + input); + count++; + } + + @WebMethod + public int getCount() + { + return count; + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointOneImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java 2010-06-11 20:47:39 UTC (rev 12473) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060; + +import javax.jws.Oneway; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointTwo +{ + String sayHello(String input); + + @Oneway + void sayHelloOneWay(String input); + + int getCount(); +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwo.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java 2010-06-11 20:47:39 UTC (rev 12473) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060; + +import javax.ejb.Stateless; +import javax.jws.Oneway; +import javax.jws.WebMethod; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; + +@WebService(name = "EndpointTwo", targetNamespace = "http://org.jboss.ws.jaxws.cxf/jbws3060", serviceName = "ServiceTwo") +@SOAPBinding(style = SOAPBinding.Style.RPC) +@Stateless +public class EndpointTwoImpl +{ + private volatile static int count = 0; + + @WebMethod + public String sayHello(String input) + { + Logger.getLogger(this.getClass()).info("sayHello: " + input); + count++; + return "Hi " + input; + } + + @WebMethod + @Oneway + public void sayHelloOneWay(String input) + { + Logger.getLogger(this.getClass()).info("sayHelloOneWay: " + input); + count++; + } + + @WebMethod + public int getCount() + { + return count; + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/EndpointTwoImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java 2010-06-11 20:47:39 UTC (rev 12473) @@ -0,0 +1,172 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2010, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file 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.cxf.jbws3060; + +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; + +/** + * Test a CXF endpoint with provided jbossws-cxf.xml + * + * @author alessio.soldano(a)jboss.com + * @since 11-Jun-2010 + */ +public class JBWS3060TestCase extends JBossWSTest +{ + private String endpointOneURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointOne"; + private String endpointTwoURL = "http://" + getServerHost() + ":8080/jaxws-cxf-jbws3060/EndpointTwo"; + private String targetNS = "http://org.jboss.ws.jaxws.cxf/jbws3060"; + + private EndpointOne portOne; + private EndpointTwo portTwo; + + public static Test suite() + { + return new JBossWSTestSetup(JBWS3060TestCase.class, "jaxws-cxf-jbws3060.jar"); + } + + public void testAccess() throws Exception + { + initPorts(); + int count1 = portOne.getCount(); + int count2 = portTwo.getCount(); + Object retObj = portOne.echo("Hello"); + assertEquals("Hello", retObj); + retObj = portTwo.sayHello("John"); + assertEquals("Hi John", retObj); + assertEquals(1, portOne.getCount() - count1); + assertEquals(1, portTwo.getCount() - count2); + } + + public void testConcurrentInvocations() throws Exception + { + runConcurrentTests(false); + } + + public void testConcurrentOneWayInvocations() throws Exception + { + runConcurrentTests(true); + } + + private void runConcurrentTests(boolean oneway) throws Exception + { + initPorts(); + final int size = 30; + int count1 = portOne.getCount(); + int count2 = portTwo.getCount(); + ExecutorService es = Executors.newFixedThreadPool(size*2); + List<Callable<Boolean>> callables = new ArrayList<Callable<Boolean>>(size*2); + for (int i = 0; i < size; i++) + { + callables.add(new CallableOne(portOne, oneway)); + callables.add(new CallableTwo(portTwo, oneway)); + } + List<Future<Boolean>> futures = es.invokeAll(callables); + for (Future<Boolean> f : futures) + { + assertTrue(f.get()); + } + assertEquals(size, portOne.getCount() - count1); + assertEquals(size, portTwo.getCount() - count2); + } + + private void initPorts() throws MalformedURLException + { + URL wsdlOneURL = new URL(endpointOneURL + "?wsdl"); + QName serviceOneName = new QName(targetNS, "ServiceOne"); + Service serviceOne = Service.create(wsdlOneURL, serviceOneName); + portOne = (EndpointOne)serviceOne.getPort(EndpointOne.class); + + URL wsdlTwoURL = new URL(endpointTwoURL + "?wsdl"); + QName serviceTwoName = new QName(targetNS, "ServiceTwo"); + Service serviceTwo = Service.create(wsdlTwoURL, serviceTwoName); + portTwo = (EndpointTwo)serviceTwo.getPort(EndpointTwo.class); + } + + private static class CallableOne implements Callable<Boolean> + { + private EndpointOne port; + private boolean oneway; + + public CallableOne(EndpointOne port, boolean oneway) + { + this.port = port; + this.oneway = oneway; + } + + public Boolean call() throws Exception + { + String arg = "Foo"; + if (oneway) + { + port.echoOneWay(arg); + return true; + } + else + { + String result = port.echo(arg); + return arg.equals(result); + } + } + } + + private static class CallableTwo implements Callable<Boolean> + { + private EndpointTwo port; + private boolean oneway; + + public CallableTwo(EndpointTwo port, boolean oneway) + { + this.port = port; + this.oneway = oneway; + } + + public Boolean call() throws Exception + { + String arg = "John"; + if (oneway) + { + port.sayHelloOneWay(arg); + return true; + } + else + { + String result = port.sayHello(arg); + return ("Hi " + arg).equals(result); + } + } + } +} Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3060/JBWS3060TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF