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

[jbossws-commits at lists.jboss.org]

Author: rsearls
Date: 2014-12-22 19:38:29 -0500 (Mon, 22 Dec 2014)
New Revision: 19210

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

Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java	2014-12-23 00:32:24 UTC (rev 19209)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1969/JBWS1969TestCase.java	2014-12-23 00:38:29 UTC (rev 19210)
@@ -30,7 +30,15 @@
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
 
-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.wsf.test.JBossWSTest;
 import org.jboss.wsf.test.JBossWSTestHelper;
@@ -42,31 +50,30 @@
  * other than toplevel "META-INF/wsdl" directory
  * @author <a href="mailto:mageshbk at jboss.com">Magesh Kumar B</a>
  */
+ at RunWith(Arquillian.class)
 public class JBWS1969TestCase extends JBossWSTest
 {
-   public static BaseDeployment<?>[] createDeployments() {
-      List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
-      list.add(new JBossWSTestHelper.JarDeployment("jaxws-jbws1969.jar") { {
+   @ArquillianResource
+   private URL baseURL;
+
+   @Deployment(testable = false)
+   public static JavaArchive createDeployments() {
+      JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1969.jar");
          archive
                .addManifest()
                .addClass(org.jboss.test.ws.jaxws.jbws1969.Endpoint.class)
                .addClass(org.jboss.test.ws.jaxws.jbws1969.EndpointImpl.class)
                .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl"), "wsdl/echo/TestService.wsdl")
                .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1969/META-INF/wsdl/echo/TestService.xsd"), "wsdl/echo/TestService.xsd");
-         }
-      });
-      return list.toArray(new BaseDeployment<?>[list.size()]);
+      return archive;
    }
 
-   public static Test suite()
-   {
-      return new JBossWSTestSetup(JBWS1969TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
-   }
-
+   @Test
+   @RunAsClient
    public void testSubDirectory() throws Exception
    {
       // WSDL and Schema files are loaded in META-INF/wsdl/echo directory
-      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1969?wsdl");
+      URL wsdlURL = new URL(baseURL + "/jaxws-jbws1969?wsdl");
       WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
       Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
       assertNotNull(wsdlDefinition);