FORGE-1872: Ensuring the class is loaded through the correct classloader

forge · Jun 6, 2014 · 940fe92 · 940fe92
1 parent 9a400ac
commit 940fe92
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/.../java/test/org/jboss/forge/furnace/addons/AddonRegistryIncompatibleServiceLookupTest.java b/.../java/test/org/jboss/forge/furnace/addons/AddonRegistryIncompatibleServiceLookupTest.java
@@ -105,9 +105,9 @@ public void testServiceWithExpectedObjectsDifferentClassLoaders() throws Excepti
       Assert.assertFalse(depOneServiceRegistry.hasService(Aa.class.getName()));
       Assert.assertFalse(depTwoServiceRegistry.hasService(Aa.class));
       Assert.assertFalse(depTwoServiceRegistry.hasService(Aa.class.getName()));
-      Assert.assertFalse(depOneServiceRegistry.hasService(BB.class));
+      Assert.assertFalse(depOneServiceRegistry.hasService(loadClass(BB.class, depTwo.getClassLoader())));
       Assert.assertTrue(depOneServiceRegistry.hasService(BB.class.getName()));
-      Assert.assertTrue(depTwoServiceRegistry.hasService(BB.class));
+      Assert.assertTrue(depTwoServiceRegistry.hasService(loadClass(BB.class, depTwo.getClassLoader())));
       Assert.assertTrue(depTwoServiceRegistry.hasService(BB.class.getName()));
 
       Assert.assertNotNull(depTwoServiceRegistry.getExportedInstance(BB.class.getName()));
@@ -121,4 +121,9 @@ public void testServiceWithExpectedObjectsDifferentClassLoaders() throws Excepti
       Assert.assertFalse(iterator2.hasNext());
    }
 
+   private Class<?> loadClass(Class<?> clazz, ClassLoader cl) throws Exception
+   {
+      return cl.loadClass(clazz.getName());
+   }
+
 }