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

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Dec 25 17:37:59 EST 2014


Author: rsearls
Date: 2014-12-25 17:37:59 -0500 (Thu, 25 Dec 2014)
New Revision: 19264

Modified:
   stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
Log:
arquillian migration jbws1581 test

Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java	2014-12-25 21:37:59 UTC (rev 19263)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java	2014-12-25 22:37:59 UTC (rev 19264)
@@ -28,7 +28,18 @@
 import javax.wsdl.Definition;
 import javax.wsdl.factory.WSDLFactory;
 
-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.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.arquillian.container.test.api.Deployer;
 
 import org.jboss.wsf.test.JBossWSTest;
 import org.jboss.wsf.test.JBossWSTestHelper;
@@ -42,80 +53,106 @@
  * @author Thomas.Diesler at jboss.com
  * @since 19-Mar-2007
  */
+ at RunWith(Arquillian.class)
 public class JBWS1581TestCase extends JBossWSTest
 {
-   static {
-      JBossWSTestHelper.writeToFile(new JBossWSTestHelper.WarDeployment("jaxws-jbws1581-pojo.war") { {
+   private static final String WAR_DEPLOYMENT = "jaxws-jbws1581-pojo";
+   private static final String EAR_DEPLOYMENT = "jaxws-jbws1581";
+
+   @ArquillianResource
+   private URL baseURL;
+
+   @ArquillianResource
+   Deployer deployer;
+
+   @Deployment(name = WAR_DEPLOYMENT, testable = false, managed = false)
+   public static WebArchive createDeployment1() {
+      WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war");
          archive
-               .addManifest()
-               .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class)
-               .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
-               .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml"));
-         }
-      });
-      JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1581-ejb3.jar") { {
+            .addManifest()
+            .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class)
+            .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
+            .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml"));
+      writeToDisk(archive);
+      return archive;
+   }
+
+   @Deployment(testable = false)
+   public static JavaArchive createDeployment2() {
+      JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1581-ejb3.jar");
          archive
-               .addManifest()
-               .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Bean.class)
-               .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Remote.class)
-               .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
-               .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointService.class)
-               .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/permissions.xml"), "permissions.xml")
-               .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl");
-         }
-      });
-      JBossWSTestHelper.writeToFile(new JBossWSTestHelper.JarDeployment("jaxws-jbws1581.ear") { {
+            .addManifest()
+            .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Bean.class)
+            .addClass(org.jboss.test.ws.jaxws.jbws1581.EJB3Remote.class)
+            .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
+            .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointService.class)
+            .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/permissions.xml"), "permissions.xml")
+            .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl"), "wsdl/TestService.wsdl");
+      return archive;
+   }
+
+   @Deployment(name = EAR_DEPLOYMENT, testable = false, managed = false)
+   public static JavaArchive createDeployment3() {
+      JavaArchive archive = ShrinkWrap.create(JavaArchive.class, EAR_DEPLOYMENT + ".ear");
          archive
-               .addManifest()
-               .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1581-pojo.war"));
-         }
-      });
+            .addManifest()
+            .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), WAR_DEPLOYMENT + ".war"));
+      return archive;
    }
 
-   public static Test suite()
+   public static void writeToDisk(WebArchive archive)
    {
-       return new JBossWSTestSetup(JBWS1581TestCase.class, "jaxws-jbws1581-ejb3.jar");
+      File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
+      archive.as(ZipExporter.class).exportTo(file, true);
    }
-   
+
+   @Test
+   @RunAsClient
    public void testWSDLAccessWar() throws Exception {
       try {
-         JBossWSTestHelper.deploy("jaxws-jbws1581-pojo.war");
+         deployer.deploy(WAR_DEPLOYMENT);
          internalTestWSDLAccess();
       } finally {
-         JBossWSTestHelper.undeploy("jaxws-jbws1581-pojo.war");
+         deployer.undeploy(WAR_DEPLOYMENT);
       }
    }
-   
+
+   @Test
+   @RunAsClient
    public void testEJBVehicleWar() throws Exception {
       try {
-         JBossWSTestHelper.deploy("jaxws-jbws1581-pojo.war");
+         deployer.deploy(WAR_DEPLOYMENT);
          internalTestEJBVehicle();
       } finally {
-         JBossWSTestHelper.undeploy("jaxws-jbws1581-pojo.war");
+         deployer.undeploy(WAR_DEPLOYMENT);
       }
    }
 
+   @Test
+   @RunAsClient
    public void testWSDLAccessEar() throws Exception {
       try {
-         JBossWSTestHelper.deploy("jaxws-jbws1581.ear");
+         deployer.deploy(EAR_DEPLOYMENT);
          internalTestWSDLAccess();
       } finally {
-         JBossWSTestHelper.undeploy("jaxws-jbws1581.ear");
+         deployer.undeploy(EAR_DEPLOYMENT);
       }
    }
-   
+
+   @Test
+   @RunAsClient
    public void testEJBVehicleEar() throws Exception {
       try {
-         JBossWSTestHelper.deploy("jaxws-jbws1581.ear");
+         deployer.deploy(EAR_DEPLOYMENT);
          internalTestEJBVehicle();
       } finally {
-         JBossWSTestHelper.undeploy("jaxws-jbws1581.ear");
+         deployer.undeploy(EAR_DEPLOYMENT);
       }
    }
 
    private void internalTestWSDLAccess() throws Exception
    {
-      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1581-pojo?wsdl");
+      URL wsdlURL = new URL(baseURL + "/jaxws-jbws1581-pojo?wsdl");
       Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString());
       assertNotNull("wsdl expected", wsdl);
    }



More information about the jbossws-commits mailing list