Author: rsearls Date: 2014-12-30 11:26:29 -0500 (Tue, 30 Dec 2014) New Revision: 19299 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java Log: arquillian migration jbws2527 test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-12-30 16:16:02 UTC (rev 19298) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2014-12-30 16:26:29 UTC (rev 19299) @@ -26,7 +26,16 @@ import java.util.LinkedList; import java.util.List; -import junit.framework.Test; +import org.junit.Test; +import org.junit.runner.RunWith; +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.arquillian.container.test.api.Deployer; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; @@ -39,25 +48,32 @@ * * @author richard.opalka(a)jboss.com */ +(a)RunWith(Arquillian.class) public class JBWS2527TestCase extends JBossWSTest { - public static BaseDeployment<?>[] createDeployments() { - List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>(); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2527-service.war") { { + @ArquillianResource + Deployer deployer; + + @Deployment(name="jaxws-jbws2527-service", managed=false, testable = false) + public static WebArchive createClientDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2527-service.war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws2527.Hello.class) + .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloImpl.class) + .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloService.class) + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/web.xml"), "web.xml") + .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/web.xml")); + return archive; + } + + @Deployment(name="jaxws-jbws2527-client", managed=false, testable = false) + public static WebArchive createClientDeployment1() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2527-client.war"); archive .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws2527.Hello.class) - .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloImpl.class) - .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloService.class) - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/jboss-web.xml"), "jboss-web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/web.xml"), "web.xml") - .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-service/web.xml")); - } - }); - list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2527-client.war") { { - archive - .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws2527.ClientServlet.class) .addClass(org.jboss.test.ws.jaxws.jbws2527.Hello.class) .addClass(org.jboss.test.ws.jaxws.jbws2527.HelloService.class) @@ -65,20 +81,11 @@ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-client/web.xml"), "web.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl") .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2527/WEB-INF-client/web.xml")); - } - }); - return list.toArray(new BaseDeployment<?>[list.size()]); + return archive; } - - static { - JBossWSTestHelper.writeToFile(createDeployments()); - } - - public static Test suite() - { - return new JBossWSTestSetup(JBWS2527TestCase.class, "", true); - } + @Test + @RunAsClient public void test() throws Exception { for (int i = 0; i < 2; i++) @@ -92,15 +99,14 @@ { try { - deploy("jaxws-jbws2527-service.war"); - deploy("jaxws-jbws2527-client.war"); - + deployer.deploy("jaxws-jbws2527-service"); + deployer.deploy("jaxws-jbws2527-client"); assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2527-client/jbws2527").openStream())); } finally { - undeploy("jaxws-jbws2527-client.war"); - undeploy("jaxws-jbws2527-service.war"); + deployer.undeploy("jaxws-jbws2527-client"); + deployer.undeploy("jaxws-jbws2527-service"); } } }