1.1 --- a/openide.util/test/unit/src/org/openide/util/lookup/MetaInfServicesLookupTest.java	Fri Mar 20 10:45:15 2009 +0100
     1.2 +++ b/openide.util/test/unit/src/org/openide/util/lookup/MetaInfServicesLookupTest.java	Fri Mar 20 16:46:35 2009 +0100
     1.3 @@ -78,6 +78,7 @@
     1.4  import org.openide.util.LookupEvent;
     1.5  import org.openide.util.LookupListener;
     1.6  import org.openide.util.RequestProcessor;
     1.7 +import org.openide.util.test.MockLookup;
     1.8  
     1.9  /** Test finding services from manifest.
    1.10   * @author Jesse Glick
    1.11 @@ -223,7 +224,7 @@
    1.12          Lookup l = getTestedLookup(c2);
    1.13          Class xface = c1.loadClass("org.foo.Interface");
    1.14          List results = new ArrayList(l.lookup(new Lookup.Template(xface)).allInstances());
    1.15 -        assertEquals(2, results.size());
    1.16 +        assertEquals("Two items in result: " + results, 2, results.size());
    1.17          // Note that they have to be in order:
    1.18          assertEquals("org.foo.impl.Implementation1", results.get(0).getClass().getName());
    1.19          assertEquals("org.bar.Implementation2", results.get(1).getClass().getName());
    1.20 @@ -385,6 +386,8 @@
    1.21          no = null;
    1.22          l = null;
    1.23          lookups.clear();
    1.24 +        MockLookup.setInstances();
    1.25 +        Thread.currentThread().setContextClassLoader(null);
    1.26          assertGC("Class can be garbage collected", ref);
    1.27      }
    1.28  

     2.1 --- a/openide.util/test/unit/src/org/openide/util/lookup/NamedServicesLookupTest.java	Fri Mar 20 10:45:15 2009 +0100
     2.2 +++ b/openide.util/test/unit/src/org/openide/util/lookup/NamedServicesLookupTest.java	Fri Mar 20 16:46:35 2009 +0100
     2.3 @@ -66,8 +66,8 @@
     2.4      @Override
     2.5      protected Lookup createLookup(ClassLoader c) {
     2.6          MockLookup.setInstances(c);
     2.7 +        Thread.currentThread().setContextClassLoader(c);
     2.8          Lookup l = Lookups.forPath("sub/path");
     2.9 -        MockLookup.setInstances();
    2.10          return l;
    2.11      }
    2.12