[jboss-cvs] JBossAS SVN: r98106 - in projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers: vfs and 1 other directory.

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

Author: johnbailey
Date: 2009-12-21 18:42:40 -0500 (Mon, 21 Dec 2009)
New Revision: 98106

Removed:
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/redeploy/
Modified:
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BaseDeployersVFSTest.java
Log:
Cleanup some unecessary tests with VFS3 integraion

Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BaseDeployersVFSTest.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BaseDeployersVFSTest.java	2009-12-21 23:08:02 UTC (rev 98105)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/BaseDeployersVFSTest.java	2009-12-21 23:42:40 UTC (rev 98106)
@@ -21,7 +21,6 @@
 */
 package org.jboss.test.deployers;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.jboss.deployers.client.spi.DeployerClient;
@@ -83,7 +82,9 @@
    protected String getURL(String path) throws Exception
    {
       URL url = getResource(path);
-      return url.toString();
+      if (url == null)
+         throw new IllegalArgumentException("Null url");
+      return new URL("jar:" + url + "!/").toString();
    }
    /**
     * Get a vfs url string from a path
@@ -108,7 +109,9 @@
    protected String getJarURL(String path) throws Exception
    {
       URL url = getResource(path);
-      url = createJarURL(url);
+      if (url == null)
+         throw new IllegalArgumentException("Null url");
+      url = new URL("jar:" + url + "!/");
       return url.toString();
    }
 
@@ -159,12 +162,4 @@
       VirtualFile file = getVirtualFile(root, path);
       return new AbstractVFSDeploymentContext(file, "");
    }
-   
-   private URL createJarURL(URL url) throws MalformedURLException
-   {
-      if (url == null)
-         throw new IllegalArgumentException("Null url");
-      return new URL("jar:" + url + "!/");
-   }
-
 }