Merge branch 'master' of github.com:forge/furnace into FORGE-770

forge · Jul 6, 2013 · 379f373 · 379f373
2 parents dd85991 + 0f248d8
commit 379f373
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/proxy-tests/src/test/java/org/jboss/forge/classloader/ClassLoaderAdapterJavaIOTest.java b/proxy-tests/src/test/java/org/jboss/forge/classloader/ClassLoaderAdapterJavaIOTest.java
@@ -64,7 +64,7 @@ public void testSimpleFileProxy() throws Exception
       File file = (File) foreignType.getMethod("getFile")
                .invoke(foreignType.newInstance());
 
-      Assert.assertTrue(file instanceof File);
+      Assert.assertNotNull(file);
       Assert.assertTrue(file.getClass().equals(File.class));
 
       Object delegate = foreignType.newInstance();

diff --git a/proxy-tests/src/test/java/org/jboss/forge/classloader/mock/JavaIOFactory.java b/proxy-tests/src/test/java/org/jboss/forge/classloader/mock/JavaIOFactory.java
@@ -22,7 +22,7 @@ public File getFile()
 
    public void useFile(File file)
    {
-      if (!(file instanceof File))
+      if (file == null)
          throw new IllegalArgumentException("Should have been a File");
       if (!file.getClass().equals(File.class))
          throw new IllegalArgumentException("Should have been a File class");

diff --git a/.../java/org/jboss/forge/classloader/system/SystemClassLoaderNullClassLoaderAdapterTest.java b/.../java/org/jboss/forge/classloader/system/SystemClassLoaderNullClassLoaderAdapterTest.java
@@ -9,13 +9,9 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.forge.arquillian.archive.ForgeArchive;
-import org.jboss.forge.furnace.Furnace;
-import org.jboss.forge.furnace.addons.AddonRegistry;
 import org.jboss.forge.proxy.ClassLoaderAdapterBuilder;
 import org.jboss.forge.proxy.Proxies;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -43,12 +39,6 @@ public static ForgeArchive getDeployment()
       return archive;
    }
 
-   @Inject
-   private AddonRegistry registry;
-
-   @Inject
-   private Furnace furnace;
-
    @SuppressWarnings("unchecked")
    @Test
    public void testNullSystemClassLoaderDefaultsToFurnaceProxyCL() throws Exception