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

[jbossws-commits at lists.jboss.org]

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

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

Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java	2014-12-22 23:58:18 UTC (rev 19207)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/as3581/AS3581TestCase.java	2014-12-23 00:05:29 UTC (rev 19208)
@@ -30,7 +30,15 @@
 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.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.wsf.test.JBossWSTest;
 import org.jboss.wsf.test.JBossWSTestHelper;
@@ -42,11 +50,15 @@
  *
  * @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
  */
+ at RunWith(Arquillian.class)
 public class AS3581TestCase extends JBossWSTest
 {
-   public static BaseDeployment<?>[] createDeployments() {
-      List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
-      list.add(new JBossWSTestHelper.WarDeployment("jaxws-as3581.war") { {
+   @ArquillianResource
+   private URL baseURL;
+
+   @Deployment(testable = false)
+   public static WebArchive createDeployments() {
+      WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-as3581.war");
          archive
                .addManifest()
                .addClass(org.jboss.test.ws.jaxws.as3581.EndpointIface.class)
@@ -54,27 +66,22 @@
                .addClass(org.jboss.test.ws.jaxws.as3581.EndpointImpl.class)
                .addClass(org.jboss.test.ws.jaxws.as3581.EndpointImpl2.class)
                .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/as3581/WEB-INF/web.xml"));
-         }
-      });
-      return list.toArray(new BaseDeployment<?>[list.size()]);
+      return archive;
    }
 
-   public static Test suite()
-   {
-      return new JBossWSTestSetup(AS3581TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
-   }
-
+   @Test
+   @RunAsClient
    public void testEndpoint() throws Exception
    {
       // test one-way scenario
       final QName serviceName = new QName("org.jboss.test.ws.jaxws.as3581", "SimpleService");
-      final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-as3581/SimpleService?wsdl");
+      final URL wsdlURL = new URL(baseURL + "/SimpleService?wsdl");
       final Service service = Service.create(wsdlURL, serviceName);
       final EndpointIface port = service.getPort(EndpointIface.class);
       port.doit();
       // test req-resp scenario
       final QName serviceName2 = new QName("org.jboss.test.ws.jaxws.as3581", "SimpleService2");
-      final URL wsdlURL2 = new URL("http://" + getServerHost() + ":8080/jaxws-as3581/SimpleService2?wsdl");
+      final URL wsdlURL2 = new URL(baseURL + "/SimpleService2?wsdl");
       final Service service2 = Service.create(wsdlURL2, serviceName2);
       final EndpointIface2 port2 = service2.getPort(EndpointIface2.class);
       final String oneWayLookupString = port2.getString();