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

[jbossws-commits at lists.jboss.org]

Author: rsearls
Date: 2014-12-22 10:22:10 -0500 (Mon, 22 Dec 2014)
New Revision: 19181

Modified:
   stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java
Log:
arquillian conversion jbws2278 test

Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java	2014-12-22 12:37:34 UTC (rev 19180)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2278/JBWS2278TestCase.java	2014-12-22 15:22:10 UTC (rev 19181)
@@ -33,7 +33,15 @@
 import javax.xml.ws.Service;
 import javax.xml.ws.handler.Handler;
 
-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.shrinkwrap.api.ArchivePath;
 import org.jboss.shrinkwrap.api.Filter;
@@ -49,40 +57,37 @@
  * @since 30-Sep-2008
  * @see https://jira.jboss.org/jira/browse/JBWS-2278
  */
+ at RunWith(Arquillian.class)
 public class JBWS2278TestCase extends JBossWSTest
 {
    private TestEndpoint port11;
    private TestEndpoint port12;
 
-   public static BaseDeployment<?>[] createDeployments() {
-      List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
-      list.add(new JBossWSTestHelper.WarDeployment("jaxws-jbws2278.war") { {
+   @ArquillianResource
+   private URL baseURL;
+
+   @Deployment(testable = false)
+   public static WebArchive createDeployments() {
+      WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2278.war");
          archive
-               .addManifest()
-               .addPackages(false, new Filter<ArchivePath> () {
-                  @Override
-                  public boolean include(ArchivePath path)
-                  {
-                     return !path.get().contains("TestCase");
-                  }}, "org.jboss.test.ws.jaxws.jbws2278")
-               .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/jboss-web.xml"), "jboss-web.xml")
-               .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/wsdl/Test.wsdl"), "wsdl/Test.wsdl")
-               .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/web.xml"));
-         }
-      });
-      return list.toArray(new BaseDeployment<?>[list.size()]);
+            .addManifest()
+            .addPackages(false, new Filter<ArchivePath> () {
+               @Override
+               public boolean include(ArchivePath path)
+               {
+                  return !path.get().contains("TestCase");
+               }}, "org.jboss.test.ws.jaxws.jbws2278")
+            .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/jboss-web.xml"), "jboss-web.xml")
+            .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/wsdl/Test.wsdl"), "wsdl/Test.wsdl")
+            .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2278/WEB-INF/web.xml"));
+      return archive;
    }
 
-   public static Test suite() throws Exception
-   {
-      return new JBossWSTestSetup(JBWS2278TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
-   }
-
    @Override
    public void setUp() throws Exception
    {
       super.setUp();
-      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2278/soap11?wsdl");
+      URL wsdlURL = new URL(baseURL + "/soap11?wsdl");
       QName serviceName = new QName("http://org.jboss.test.ws/jbws2278", "TestService");
 
       Service service = Service.create(wsdlURL, serviceName);
@@ -100,17 +105,23 @@
       ((BindingProvider)port12).getBinding().setHandlerChain(handlerChain12);
    }
 
+   @Test
+   @RunAsClient
    public void testCallSoap11() throws Exception
    {
+      setUp();
       final String message = "Hello!!";
       String response = port11.echo(message);
       assertEquals(message, response);
    }
 
+   @Test
+   @RunAsClient
    public void testCheckedExceptionSoap11() throws Exception
    {
       try
       {
+         setUp();
          port11.echo(TestEndpointImpl.TEST_EXCEPTION);
          fail("Expected TestException not thrown.");
       }
@@ -120,10 +131,13 @@
       }
    }
 
+   @Test
+   @RunAsClient
    public void testRuntimeExceptionSoap11()
    {
       try
       {
+         setUp();
          port11.echo(TestEndpointImpl.RUNTIME_EXCEPTION);
          fail("Expected Exception not thrown.");
       }
@@ -133,17 +147,23 @@
       }
    }
 
+   @Test
+   @RunAsClient
    public void testCallSoap12() throws Exception
    {
+      setUp();
       final String message = "Hello!!";
       String response = port12.echo(message);
       assertEquals(message, response);
    }
 
+   @Test
+   @RunAsClient
    public void testCheckedExceptionSoap12() throws Exception
    {
       try
       {
+         setUp();
          port12.echo(TestEndpointImpl.TEST_EXCEPTION);
          fail("Expected TestException not thrown.");
       }
@@ -153,10 +173,13 @@
       }
    }
 
+   @Test
+   @RunAsClient
    public void testRuntimeExceptionSoap12()
    {
       try
       {
+         setUp();
          port12.echo(TestEndpointImpl.RUNTIME_EXCEPTION);
          fail("Expected Exception not thrown.");
       }