1.1 --- a/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java	Mon May 17 14:20:21 2010 -0400
     1.2 +++ b/visualweb.project.jsfloader/test/unit/src/org/netbeans/modules/visualweb/project/jsfloader/test/SetupUtils.java	Wed Mar 23 17:17:42 2011 -0400
     1.3 @@ -55,6 +55,7 @@
     1.4  import org.netbeans.api.project.Project;
     1.5  import org.netbeans.api.project.ProjectManager;
     1.6  import org.netbeans.api.project.ui.OpenProjects;
     1.7 +import org.netbeans.junit.MockServices;
     1.8  import org.netbeans.modules.visualweb.project.jsfloader.JsfJavaDataLoader;
     1.9  import org.netbeans.modules.visualweb.project.jsfloader.JsfJspDataLoader;
    1.10  import org.openide.filesystems.FileLock;
    1.11 @@ -65,34 +66,18 @@
    1.12  import org.openide.util.Lookup;
    1.13  import org.openide.util.LookupEvent;
    1.14  import org.openide.util.LookupListener;
    1.15 -import org.openide.util.test.MockLookup;
    1.16  
    1.17  /**
    1.18   *
    1.19   * @author quynguyen
    1.20   */
    1.21  public class SetupUtils {
    1.22 -    private static JsfJspDataLoader jspLoader = null;
    1.23 -    private static JsfJavaDataLoader javaLoader = null;
    1.24 -    
    1.25      public static Project setup(File workDir) throws IOException {
    1.26          File userDir = new File(workDir, "userdir");
    1.27          userDir.mkdir();
    1.28          System.getProperties().put("netbeans.user", userDir.getAbsolutePath());
    1.29 -        
    1.30 -        MockLookup.init();
    1.31 -        DataLoaderPool pool = new SetupUtils.DefaultPool();
    1.32 -        MockLookup.setInstances(pool);
    1.33 -        
    1.34 -        if (jspLoader == null) {
    1.35 -            jspLoader = new JsfJspDataLoader();
    1.36 -        }
    1.37 -        
    1.38 -        if (javaLoader == null) {
    1.39 -            javaLoader = new JsfJavaDataLoader();
    1.40 -        }
    1.41 -        
    1.42 -        MockLookup.setInstances(pool, jspLoader, javaLoader);
    1.43 +
    1.44 +        MockServices.setServices(SetupUtils.DefaultPool.class, JsfJspDataLoader.class, JsfJavaDataLoader.class);
    1.45          
    1.46          String zipResource = "VWJavaEE5.zip";
    1.47          String zipPath = SetupUtils.class.getResource(zipResource).getPath();
    1.48 @@ -123,11 +108,11 @@
    1.49      }
    1.50  
    1.51      public static JsfJavaDataLoader getJavaLoader() {
    1.52 -        return javaLoader;
    1.53 +        return JsfJavaDataLoader.findObject(JsfJavaDataLoader.class, true);
    1.54      }
    1.55  
    1.56      public static JsfJspDataLoader getJspLoader() {
    1.57 -        return jspLoader;
    1.58 +        return JsfJspDataLoader.findObject(JsfJspDataLoader.class, true);
    1.59      }
    1.60      
    1.61      private static void unZipFile(File archiveFile, FileObject destDir) throws IOException {