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

[jbossws-commits at lists.jboss.org]

Author: rsearls
Date: 2014-12-29 09:56:57 -0500 (Mon, 29 Dec 2014)
New Revision: 19296

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

Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java	2014-12-28 22:59:59 UTC (rev 19295)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java	2014-12-29 14:56:57 UTC (rev 19296)
@@ -30,7 +30,19 @@
 
 import javax.xml.ws.spi.Provider;
 
-import junit.framework.Test;
+import org.jboss.wsf.test.JBossWSTestHelper;
+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.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.arquillian.container.test.api.OperateOnDeployment;
 
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.wsf.test.JBossWSTest;
@@ -46,51 +58,58 @@
  * @author alessio.soldano at jboss.com
  * @since 14-Jun-2007
  */
+ at RunWith(Arquillian.class)
 public class JBWS1666TestCase extends JBossWSTest
 {
    private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows
 
    java.util.Properties props = System.getProperties();
-   
-   public static BaseDeployment<?>[] createDeployments() {
-      List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
-      list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws1666.war") { {
-         archive
-               .addManifest()
-               .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpointImpl.class)
-               .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1666/WEB-INF/web.xml"));
-         }
-      });
-      list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1666-client.jar") { {
-         archive
-               .setManifest(new StringAsset("Manifest-Version: 1.0\n"
-                     + "Main-Class: org.jboss.test.ws.jaxws.jbws1666.TestClient\n"
-                     + "Dependencies: javax.jws.api,javax.xml.ws.api\n"))
-               .addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class)
-               .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class);
-         }
-      });
-      list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1666-b-client.jar") { {
-         archive
-               .setManifest(new StringAsset("Manifest-Version: 1.0\n"
-                     + "Main-Class: org.jboss.test.ws.jaxws.jbws1666.TestClient\n"
-                     + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n"))
-               .addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class)
-               .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class);
-         }
-      });
-      return list.toArray(new BaseDeployment<?>[list.size()]);
+
+   @Deployment(name="jaxws-jbws1666", testable = false)
+   public static WebArchive createClientDeployment() {
+      WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws1666.war");
+      archive
+         .addManifest()
+         .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpointImpl.class)
+         .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1666/WEB-INF/web.xml"));
+      return archive;
    }
-   
-   static {
-      JBossWSTestHelper.writeToFile(createDeployments());
+
+   @Deployment(name = "jaxws-jbws1666-client", testable = false, managed=false)
+   public static JavaArchive createClientDeployment1() {
+      JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1666-client.jar");
+      archive
+         .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+            + "Main-Class: org.jboss.test.ws.jaxws.jbws1666.TestClient\n"
+            + "Dependencies: javax.jws.api,javax.xml.ws.api\n"))
+         .addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class)
+         .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class);
+      writeToDisk(archive);
+      return archive;
    }
 
-   public static Test suite()
+   @Deployment(name = "jaxws-jbws1666-b-client", testable = false, managed = false)
+   public static JavaArchive createClientDeployment2() {
+      JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1666-b-client.jar");
+      archive
+         .setManifest(new StringAsset("Manifest-Version: 1.0\n"
+            + "Main-Class: org.jboss.test.ws.jaxws.jbws1666.TestClient\n"
+            + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n"))
+         .addClass(org.jboss.test.ws.jaxws.jbws1666.TestClient.class)
+         .addClass(org.jboss.test.ws.jaxws.jbws1666.TestEndpoint.class);
+      writeToDisk(archive);
+      return archive;
+   }
+
+   public static void writeToDisk(JavaArchive archive)
    {
-      return new JBossWSTestSetup(JBWS1666TestCase.class, "jaxws-jbws1666.war");
+      File file = new File(JBossWSTestHelper.getTestArchiveDir(), archive.getName());
+      archive.as(ZipExporter.class).exportTo(file, true);
    }
 
+   @Test
+   @RunAsClient
+   @OperateOnDeployment("jaxws-jbws1666")
    public void testClientInTestsuiteJVM() throws Exception
    {
       String resStr = TestClient.testPortAccess(getServerHost());