[jboss-cvs] JBossAS SVN: r86748 - projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test.

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

Author: alesj
Date: 2009-04-03 09:32:55 -0400 (Fri, 03 Apr 2009)
New Revision: 86748

Modified:
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/AbstractVFSTest.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java
Log:
Remove Carlo's hack.

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/AbstractVFSTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/AbstractVFSTest.java	2009-04-03 13:22:37 UTC (rev 86747)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/AbstractVFSTest.java	2009-04-03 13:32:55 UTC (rev 86748)
@@ -22,6 +22,8 @@
 package org.jboss.test.virtual.test;
 
 import java.net.URL;
+import java.util.Map;
+import java.lang.reflect.Field;
 
 import junit.framework.AssertionFailedError;
 import org.jboss.test.BaseTestCase;
@@ -65,6 +67,21 @@
       this.forceNoReaper = forceNoReaper;
    }
 
+   @SuppressWarnings("unchecked")
+   protected static Map<String, VFSContextFactory> getFactoryByProtocol()
+   {
+      try
+      {
+         Field field = VFSContextFactoryLocator.class.getDeclaredField("factoryByProtocol");
+         field.setAccessible(true);
+         return (Map<String, VFSContextFactory>) field.get(null);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
    protected void setUp() throws Exception
    {
       super.setUp();

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java	2009-04-03 13:22:37 UTC (rev 86747)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/VFSCacheTest.java	2009-04-03 13:32:55 UTC (rev 86748)
@@ -22,19 +22,16 @@
 package org.jboss.test.virtual.test;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Map;
 
 import org.jboss.virtual.VFS;
-import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.plugins.context.jar.JarContextFactory;
 import org.jboss.virtual.spi.VFSContext;
 import org.jboss.virtual.spi.VFSContextFactory;
-import org.jboss.virtual.spi.VFSContextFactoryLocator;
 import org.jboss.virtual.spi.cache.CacheStatistics;
 import org.jboss.virtual.spi.cache.VFSCache;
 import org.jboss.virtual.spi.cache.VFSCacheFactory;
@@ -64,32 +61,6 @@
          cache.stop();
    }
 
-   private static Map<String, VFSContextFactory> getFactoryByProtocol()
-   {
-      try
-      {
-         Field field = VFSContextFactoryLocator.class.getDeclaredField("factoryByProtocol");
-         field.setAccessible(true);
-         return (Map<String, VFSContextFactory>) field.get(null);
-      }
-      catch (SecurityException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (NoSuchFieldException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (IllegalArgumentException e)
-      {
-         throw new RuntimeException(e);
-      }
-      catch (IllegalAccessException e)
-      {
-         throw new RuntimeException(e);
-      }
-   }
-   
    @SuppressWarnings("deprecation")
    public void testCache() throws Exception
    {
@@ -269,24 +240,7 @@
          stopCache(cache);
       }
    }
-   
-   /**
-    * VFSCache assumes that VFSUtils.stripProtocol gives out usable paths
-    * to key upon.
-    */
-   public void testVFSUtilsStripProtocol() throws Exception
-   {
-      URL url = getResource("/vfs/test/jar1.jar");
-      
-      VirtualFile manifest = VFS.getRoot(url).getChild("META-INF/MANIFEST.MF");
-      String expected = VFSUtils.stripProtocol(manifest.toURI());
-      
-      URL manifestURL = new URL("jar:" + url.toExternalForm() + "!/META-INF/MANIFEST.MF");
-      String actual = VFSUtils.stripProtocol(manifestURL.toURI());
-      
-      assertEquals("path from jar:file: url is not usable", expected, actual);
-   }
-   
+
    private class WrapperVFSCache implements VFSCache
    {
       private VFSCache delegate;