[jbossws-commits] JBossWS SVN: r19337 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307.

Author: asoldano Date: 2015-01-07 18:13:54 -0500 (Wed, 07 Jan 2015) New Revision: 19337 Removed: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java Log: Do not re-use the same deployment in multiple tests, as that prevents parallel testsuite execution Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2015-01-07 21:40:32 UTC (rev 19336) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/DeploymentArchives.java 2015-01-07 23:13:54 UTC (rev 19337) @@ -1,94 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2014, 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.jbws2307; - -import java.io.File; - -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.wsf.test.JBossWSTestHelper; - -public final class DeploymentArchives -{ - public static final String SERVER_DEPLOYMENT = "jaxws-jbws2307-service"; - public static WebArchive createDeployment() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, SERVER_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml")); - return archive; - } - - public static final String CLIENT_2_DEPLOYMENT = "jaxws-jbws2307-client-2"; - public static WebArchive createDeployment2() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_2_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml")); - return archive; - } - - public static final String CLIENT_3_DEPLOYMENT = "jaxws-jbws2307-client-3"; - public static WebArchive createDeployment3() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_3_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml")); - return archive; - } - - public static final String CLIENT_DEPLOYMENT = "jaxws-jbws2307-client"; - public static WebArchive createDeployment4() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2307-client.war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml")); - return archive; - } - - private DeploymentArchives() { - //NOOP - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-01-07 21:40:32 UTC (rev 19336) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-01-07 23:13:54 UTC (rev 19337) @@ -22,45 +22,107 @@ package org.jboss.test.ws.jaxws.jbws2307; import java.io.BufferedReader; +import java.io.File; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; /** - * JBWS-2307 / JBWS-2997 testcase + * [JBWS-2307] / [JBWS-2997] testcase + * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException * * @author alessio.soldano(a)jboss.com */ @RunWith(Arquillian.class) public class JBWS2307MTOMTestCase extends JBossWSTest { + public static final String SERVER_DEPLOYMENT = "jaxws-jbws2307-service"; + public static final String CLIENT_DEPLOYMENT = "jaxws-jbws2307-client"; + public static final String CLIENT_2_DEPLOYMENT = "jaxws-jbws2307-client-2"; + public static final String CLIENT_3_DEPLOYMENT = "jaxws-jbws2307-client-3"; + @ArquillianResource private URL baseURL; - @Deployment(name= DeploymentArchives.SERVER_DEPLOYMENT, order=1, testable = false) - public static WebArchive createClientDeployment() { - return DeploymentArchives.createDeployment(); + @ArquillianResource + Deployer deployer; + + @Deployment(name = SERVER_DEPLOYMENT, order=1, testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, SERVER_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloImpl.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-service/web.xml")); + return archive; } - @Deployment(name = DeploymentArchives.CLIENT_DEPLOYMENT, order=2, testable = false) + @Deployment(name = CLIENT_DEPLOYMENT, order=2, testable = false) public static WebArchive createDeployment4() { - return DeploymentArchives.createDeployment4(); + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web.xml")); + return archive; } + @Deployment(name = CLIENT_3_DEPLOYMENT, testable = false, managed = false) + public static WebArchive createDeployment3() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_3_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet3.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloServiceJAXWS22.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web3.xml")); + return archive; + } + + @Deployment(name = CLIENT_2_DEPLOYMENT, testable = false, managed = false) + public static WebArchive createDeployment2() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_2_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2307.ClientServlet2.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2307.HelloService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2307/WEB-INF-client/web2.xml")); + return archive; + } + @Test @RunAsClient - @OperateOnDeployment(DeploymentArchives.CLIENT_DEPLOYMENT) + @OperateOnDeployment(CLIENT_DEPLOYMENT) public void testMTOM() throws Exception { assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); @@ -68,11 +130,46 @@ @Test @RunAsClient - @OperateOnDeployment(DeploymentArchives.CLIENT_DEPLOYMENT) + @OperateOnDeployment(CLIENT_DEPLOYMENT) public void testClient() throws Exception { HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection(); BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); assertEquals("true", isr.readLine()); } + + @Test + @RunAsClient + @OperateOnDeployment(SERVER_DEPLOYMENT) + public void testUsingClientArchive3() throws Exception + { + try { + deployer.deploy(CLIENT_3_DEPLOYMENT); + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); + HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection(); + BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); + assertEquals("true", isr.readLine()); + } finally { + deployer.undeploy(CLIENT_3_DEPLOYMENT); + } + } + + @Test + @RunAsClient + @OperateOnDeployment(SERVER_DEPLOYMENT) + public void testUsingClientArchive2() throws Exception + { + try { + deployer.deploy(CLIENT_2_DEPLOYMENT); + URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true"); + final HttpURLConnection c = (HttpURLConnection)url.openConnection(); + c.connect(); + assertEquals(500, c.getResponseCode()); + String error = IOUtils.readAndCloseStream(c.getErrorStream()); + c.disconnect(); + assertTrue(error.contains("Could not instantiate ClientServlet2")); + } finally { + deployer.undeploy(CLIENT_2_DEPLOYMENT); + } + } } Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-01-07 21:40:32 UTC (rev 19336) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-01-07 23:13:54 UTC (rev 19337) @@ -1,101 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2014, 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.jbws2307; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; - -import org.jboss.arquillian.container.test.api.Deployer; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException - * - * @author alessio.soldano(a)jboss.com - */ -(a)RunWith(Arquillian.class) -public class WebServiceRefMTOMTestCase extends JBossWSTest -{ - @ArquillianResource - private URL baseURL; - - @ArquillianResource - Deployer deployer; - - @Deployment(testable = false) - public static WebArchive createClientDeployment() { - return DeploymentArchives.createDeployment(); - } - - @Deployment(name = DeploymentArchives.CLIENT_3_DEPLOYMENT, testable = false, managed = false) - public static WebArchive createDeployment3() { - return DeploymentArchives.createDeployment3(); - } - - @Deployment(name = DeploymentArchives.CLIENT_2_DEPLOYMENT, testable = false, managed = false) - public static WebArchive createDeployment2() { - return DeploymentArchives.createDeployment2(); - } - - @Test - @RunAsClient - public void testUsingClientArchive3() throws Exception - { - try { - deployer.deploy(DeploymentArchives.CLIENT_3_DEPLOYMENT); - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); - HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); - } finally { - deployer.undeploy(DeploymentArchives.CLIENT_3_DEPLOYMENT); - } - } - - @Test - @RunAsClient - public void testUsingClientArchive2() throws Exception - { - try { - deployer.deploy(DeploymentArchives.CLIENT_2_DEPLOYMENT); - URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true"); - final HttpURLConnection c = (HttpURLConnection)url.openConnection(); - c.connect(); - assertEquals(500, c.getResponseCode()); - String error = IOUtils.readAndCloseStream(c.getErrorStream()); - c.disconnect(); - assertTrue(error.contains("Could not instantiate ClientServlet2")); - } finally { - deployer.undeploy(DeploymentArchives.CLIENT_2_DEPLOYMENT); - } - } -}