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

[jbossws-commits at lists.jboss.org]

Author: rsearls
Date: 2014-12-24 14:51:04 -0500 (Wed, 24 Dec 2014)
New Revision: 19249

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

Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java
===================================================================
--- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java	2014-12-24 19:44:28 UTC (rev 19248)
+++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws860/JBWS860TestCase.java	2014-12-24 19:51:04 UTC (rev 19249)
@@ -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.WebArchive;
 
 import org.jboss.ws.common.IOUtils;
 import org.jboss.wsf.test.JBossWSTest;
@@ -45,37 +53,38 @@
  * @author Thomas.Diesler at jboss.org
  * @since 26-Apr-2006
  */
+ at RunWith(Arquillian.class)
 public class JBWS860TestCase extends JBossWSTest
 {
-   public static BaseDeployment<?>[] createDeployments() {
-      List<BaseDeployment<?>> list = new LinkedList<BaseDeployment<?>>();
-      list.add(new WarDeployment("jaxws-jbws860.war") { {
+   @ArquillianResource
+   private URL baseURL;
+
+   @Deployment(testable = false)
+   public static WebArchive createDeployments() {
+      WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws860.war");
          archive
                .addManifest()
                .addClass(org.jboss.test.ws.jaxws.jbws860.InventoryWebService.class)
                .addClass(org.jboss.test.ws.jaxws.jbws860.UserServlet.class)
                .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws860/WEB-INF/jboss-web.xml"), "jboss-web.xml")
                .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws860/WEB-INF/web.xml"));
-         }
-      });
-      return list.toArray(new BaseDeployment<?>[list.size()]);
+      return archive;
    }
 
-   public static Test suite()
-   {
-      return new JBossWSTestSetup(JBWS860TestCase.class, JBossWSTestHelper.writeToFile(createDeployments()));
-   }
-
+   @Test
+   @RunAsClient
    public void testAccessInventoryServiceWsdl() throws Exception
    {
-      URL wsdlURL = new URL("http://" + getServerHost() + ":8080/test/InventoryWebService?wsdl");
+      URL wsdlURL = new URL(baseURL + "/InventoryWebService?wsdl");
       WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
       Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
       assertNotNull(wsdlDefinition);
    }
 
+   @Test
+   @RunAsClient
    public void testServletAccess() throws Exception
    {     
-      assertTrue(IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/test/TestServlet").openStream()).startsWith("Hello"));
+      assertTrue(IOUtils.readAndCloseStream(new URL(baseURL + "/TestServlet").openStream()).startsWith("Hello"));
    }
 }