Author: asoldano Date: 2015-02-09 12:20:16 -0500 (Mon, 09 Feb 2015) New Revision: 19443 Added: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java Removed: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java Log: [JBWS-3668] Fix previous commit Copied: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java (from rev 19441, stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java) =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java (rev 0) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-02-09 17:20:16 UTC (rev 19443) @@ -0,0 +1,177 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, 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.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-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 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; + + @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 = CLIENT_DEPLOYMENT, order=2, testable = false) + public static WebArchive 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(CLIENT_DEPLOYMENT) + public void testMTOM() throws Exception + { + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); + } + + @Test + @RunAsClient + @OperateOnDeployment(CLIENT_DEPLOYMENT) + public void testClient() throws Exception + { + HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/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() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); + HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/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() + ":" + baseURL.getPort() + "/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(); + if (error.contains("error-text-div")) { //the actual error exception does not seem to be always returned by web layer + assertTrue(error.contains("Could not instantiate ClientServlet2")); + } + } finally { + deployer.undeploy(CLIENT_2_DEPLOYMENT); + } + } +} Deleted: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-02-09 17:18:38 UTC (rev 19442) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/WebServiceRefMTOMTestCase.java 2015-02-09 17:20:16 UTC (rev 19443) @@ -1,79 +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 junit.framework.Test; - -import org.jboss.ws.common.IOUtils; -import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestSetup; - -/** - * [JBWS-3820] JAXWS 2.1 / 2.0 clients and WebServiceRef using JAXWS features cause NoSuchMethodException - * - * @author alessio.soldano(a)jboss.com - */ -public class WebServiceRefMTOMTestCase extends JBossWSTest -{ - - public static Test suite() - { - return new JBossWSTestSetup(WebServiceRefMTOMTestCase.class, DeploymentArchives.SERVER, true); - } - - public void testUsingClientArchive3() throws Exception - { - try { - JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_3); - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); - HttpURLConnection con = (HttpURLConnection)new URL("http://" + getServerHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection(); - BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); - assertEquals("true", isr.readLine()); - } finally { - JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_3); - } - } - - public void testUsingClientArchive2() throws Exception - { - try { - JBossWSTestHelper.deploy(DeploymentArchives.CLIENT_2); - URL url = new URL("http://" + getServerHost() + ":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(); - if (error.contains("error-text-div")) { //the actual error exception does not seem to be always returned by web layer - assertTrue(error.contains("Could not instantiate ClientServlet2")); - } - } finally { - JBossWSTestHelper.undeploy(DeploymentArchives.CLIENT_2); - } - } -}