Author: rsearls Date: 2014-12-25 22:55:06 -0500 (Thu, 25 Dec 2014) New Revision: 19269 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java Log: arquillian migration webserviceref test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2014-12-26 02:15:25 UTC (rev 19268) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefEJB3TestCase.java 2014-12-26 03:55:06 UTC (rev 19269) @@ -21,17 +21,31 @@ */ package org.jboss.test.ws.jaxws.samples.webserviceref; +import java.lang.Exception; +import java.lang.String; import java.net.URL; +import java.io.File; import javax.naming.InitialContext; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; +import org.junit.Test; +import org.junit.runner.RunWith; +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.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Remote; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.test.JBossWSTestHelper; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceref @@ -39,18 +53,47 @@ * @author Thomas.Diesler(a)jboss.com * @since 23-Oct-2005 */ +(a)RunWith(Arquillian.class) public class WebServiceRefEJB3TestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref"; + @ArquillianResource + private URL baseURL; - public static Test suite() - { - return new JBossWSTestSetup(WebServiceRefEJB3TestCase.class, DeploymentArchives.getServerArchiveFilename()); + @ArquillianResource + Deployer deployer; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webserviceref.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF/web.xml")); + return archive; } + private static final String DEPLOYMENT = "jaxws-samples-webserviceref-ejb3-client"; + @Deployment(name = DEPLOYMENT, testable = false, managed = false) + public static JavaArchive createDeployment1(){ + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, DEPLOYMENT + ".jar"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Remote.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class) + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/jboss.xml"), "jboss.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/permissions.xml"), "permissions.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl"); + return archive; + } + + @Test + @RunAsClient public void testDynamicProxy() throws Exception { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL = new URL(baseURL + "?wsdl"); QName qname = new QName("http://org.jboss.ws/wsref", "EndpointService"); Service service = Service.create(wsdlURL, qname); Endpoint port = (Endpoint)service.getPort(Endpoint.class); @@ -63,7 +106,7 @@ public void testEJB3Client() throws Exception { InitialContext iniCtx = null; - deploy(DeploymentArchives.getEJBClientArchiveFilename()); + deployer.deploy(DEPLOYMENT); try { iniCtx = getServerInitialContext(); @@ -79,7 +122,7 @@ { iniCtx.close(); } - undeploy(DeploymentArchives.getEJBClientArchiveFilename()); + deployer.undeploy(DEPLOYMENT); } } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-12-26 02:15:25 UTC (rev 19268) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefServletTestCase.java 2014-12-26 03:55:06 UTC (rev 19269) @@ -21,16 +21,29 @@ */ package org.jboss.test.ws.jaxws.samples.webserviceref; +import java.lang.Exception; +import java.lang.String; import java.net.URL; +import java.io.File; import javax.xml.namespace.QName; import javax.xml.ws.Service; -import junit.framework.Test; +import org.junit.Test; +import org.junit.runner.RunWith; +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.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; +import org.jboss.wsf.test.JBossWSTestHelper; /** * Test the JAXWS annotation: javax.xml.ws.WebServiceref @@ -38,18 +51,49 @@ * @author Thomas.Diesler(a)jboss.com * @since 23-Oct-2005 */ +(a)RunWith(Arquillian.class) public class WebServiceRefServletTestCase extends JBossWSTest { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-webserviceref"; + @ArquillianResource + private URL baseURL; - public static Test suite() - { - return new JBossWSTestSetup(WebServiceRefServletTestCase.class, DeploymentArchives.getServerArchiveFilename()); + @ArquillianResource + Deployer deployer; + + @Deployment(testable = false) + public static WebArchive createDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webserviceref.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointImpl.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF/web.xml")); + return archive; } + private static final String DEPLOYMENT = "jaxws-samples-webserviceref-servlet-client"; + + @Deployment(name = DEPLOYMENT, testable = false, managed = false) + public static WebArchive createDeployment1() { + + WebArchive archive = ShrinkWrap.create(WebArchive.class, DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.Endpoint.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.EndpointService.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.MultipleEndpointService.class) + .addClass(org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl"), "wsdl/MultipleEndpoint.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webserviceref/WEB-INF-client/web.xml")); + return archive; + } + + @Test + @RunAsClient public void testDynamicProxy() throws Exception { - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); + URL wsdlURL = new URL(baseURL + "?wsdl"); QName qname = new QName("http://org.jboss.ws/wsref", "EndpointService"); Service service = Service.create(wsdlURL, qname); Endpoint port = (Endpoint)service.getPort(Endpoint.class); @@ -59,17 +103,20 @@ assertEquals(helloWorld, retObj); } + @Test + @RunAsClient public void testServletClient() throws Exception { - deploy(DeploymentArchives.getServletClientArchiveFilename()); + deployer.deploy(DEPLOYMENT); try { - URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld"); + String text = baseURL.toString().substring(0, baseURL.toString().length()-1); + URL url = new URL(text + "-servlet-client?echo=HelloWorld"); assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } finally { - undeploy(DeploymentArchives.getServletClientArchiveFilename()); + deployer.undeploy(DEPLOYMENT); } } }