[jboss-cvs] JBossAS SVN: r102052 - in trunk/testsuite/src/main/org/jboss/test/webservice: admindevel and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2010-03-08 05:09:17 -0500 (Mon, 08 Mar 2010)
New Revision: 102052

Modified:
   trunk/testsuite/src/main/org/jboss/test/webservice/WebserviceTestBase.java
   trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
   trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExplodedExampleTestCase.java
   trunk/testsuite/src/main/org/jboss/test/webservice/jbas5614/JBAS5614TestCase.java
   trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
Log:
[JBAS-7342][JBWS-2948] Removing explicit VFS mount


Modified: trunk/testsuite/src/main/org/jboss/test/webservice/WebserviceTestBase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/webservice/WebserviceTestBase.java	2010-03-08 09:16:52 UTC (rev 102051)
+++ trunk/testsuite/src/main/org/jboss/test/webservice/WebserviceTestBase.java	2010-03-08 10:09:17 UTC (rev 102052)
@@ -22,21 +22,20 @@
 package org.jboss.test.webservice;
 
 import java.io.Closeable;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
-import java.io.File;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.jboss.test.JBossTestCase;
-import org.jboss.vfs.VFS;
-import org.jboss.vfs.VirtualFile;
-import org.jboss.vfs.VFSUtils;
 import org.jboss.vfs.TempFileProvider;
+import org.jboss.vfs.VFSUtils;
 
 /** Common functionality for web services test cases.
  *
@@ -95,25 +94,4 @@
       return getDeploySetup(suite, jarName);
    }
 
-   public void mountJars(String... jarNames) throws Exception
-   {
-      for(String jarName : jarNames) 
-      {
-          URL jarUrl = getURL(jarName);
-	      VirtualFile jarFile = VFS.getChild(jarUrl);
-          handles.add(VFS.mountZip(jarFile.getPhysicalFile(), jarFile, provider));
-      }
-   }
-   // Hack version that supports getting URLs for non-existent files (VFS mounts)
-   private URL getURL(String jarName) throws Exception
-   {
-      String deployDir = System.getProperty("jbosstest.deploy.dir");
-	  if (deployDir == null)
-	  {
-	     deployDir = "output/lib";
-      }
-	  String url = deployDir + "/" + jarName;
-	  File file = new File(url);
-      return file.toURL();
-   }
 }

Modified: trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java	2010-03-08 09:16:52 UTC (rev 102051)
+++ trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExampleTestCase.java	2010-03-08 10:09:17 UTC (rev 102052)
@@ -21,14 +21,13 @@
  */
 package org.jboss.test.webservice.admindevel;
 
-import junit.framework.Test;
-import org.jboss.test.webservice.WebserviceTestBase;
-
 import javax.naming.InitialContext;
 import javax.xml.rpc.Service;
 
-import org.jboss.vfs.VFS;
+import junit.framework.Test;
 
+import org.jboss.test.webservice.WebserviceTestBase;
+
 /** A test for the examples from the JBoss Admin Devel book.
  *
  * @author Thomas.Diesler at jboss.org
@@ -54,7 +53,6 @@
       super.setUp();
       if (helloPort == null)
       {
-         mountJars("ws4ee-admindevel.jar", "ws4ee-admindevel-client.jar");
          InitialContext iniCtx = getClientContext();
          Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
          helloPort = (Hello)service.getPort(Hello.class);

Modified: trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExplodedExampleTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExplodedExampleTestCase.java	2010-03-08 09:16:52 UTC (rev 102051)
+++ trunk/testsuite/src/main/org/jboss/test/webservice/admindevel/ExplodedExampleTestCase.java	2010-03-08 10:09:17 UTC (rev 102052)
@@ -43,7 +43,6 @@
 
    public void testHelloString() throws Exception
    {
-      mountJars("ws4ee-admindevel.jar", "ws4ee-admindevel-client.jar");
       InitialContext iniCtx = getClientContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloService");
       Hello helloPort = (Hello)service.getPort(Hello.class);

Modified: trunk/testsuite/src/main/org/jboss/test/webservice/jbas5614/JBAS5614TestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/webservice/jbas5614/JBAS5614TestCase.java	2010-03-08 09:16:52 UTC (rev 102051)
+++ trunk/testsuite/src/main/org/jboss/test/webservice/jbas5614/JBAS5614TestCase.java	2010-03-08 10:09:17 UTC (rev 102052)
@@ -51,7 +51,6 @@
       super.setUp();
       if (port == null)
       {
-         mountJars("webservice-jbas5614.ear", "webservice-jbas5614.ear/webservice-jbas5614-client.jar");
          InitialContext iniCtx = getClientContext("jbossws-client");
          Object lookup = iniCtx.lookup("java:comp/env/service/HelloWorldService");
          log.info("Lookup: " + lookup + " [" + lookup.getClass() + "]");

Modified: trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java	2010-03-08 09:16:52 UTC (rev 102051)
+++ trunk/testsuite/src/main/org/jboss/test/webservice/jbws309/JBWS309TestCase.java	2010-03-08 10:09:17 UTC (rev 102052)
@@ -111,7 +111,6 @@
 
    public void testBasicSecuredServiceAccess() throws Exception
    {
-      mountJars("ws4ee-jbws309.jar", "ws4ee-jbws309-client.jar");
       InitialContext iniCtx = getClientContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
       Organization endpoint = (Organization)service.getPort(new QName(nsURI, "BasicSecuredPort"), Organization.class);
@@ -170,7 +169,6 @@
 
    public void testRoleSecuredServiceAccess() throws Exception
    {
-      mountJars("ws4ee-jbws309.jar", "ws4ee-jbws309-client.jar");
       InitialContext iniCtx = getClientContext();
       Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
       Organization endpoint = (Organization)service.getPort(new QName(nsURI, "RoleSecuredPort"), Organization.class);