1.1 --- a/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.java	Mon May 17 14:19:35 2010 -0400
     1.2 +++ b/visualweb.dataconnectivity/test/unit/src/org/netbeans/modules/visualweb/dataconnectivity/test/utils/SetupProject.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.openide.filesystems.FileLock;
     1.9  import org.openide.filesystems.FileObject;
    1.10  import org.openide.filesystems.FileUtil;
    1.11 @@ -63,12 +64,6 @@
    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.loaders.DataLoader;
    1.16 -import org.openide.loaders.DataLoaderPool;
    1.17 -import org.openide.util.Lookup;
    1.18 -import org.openide.util.LookupEvent;
    1.19 -import org.openide.util.LookupListener;
    1.20 -import org.openide.util.test.MockLookup;
    1.21  
    1.22  /**
    1.23   *
    1.24 @@ -100,9 +95,7 @@
    1.25              throw new IOException("FileObject for project directory not valid");
    1.26          }
    1.27          
    1.28 -        MockLookup.init();
    1.29 -        DataLoaderPool pool = new SetupProject.DefaultPool();
    1.30 -        MockLookup.setInstances(pool);
    1.31 +        MockServices.setServices(SetupProject.DefaultPool.class);
    1.32          FileObject testApp = destFileObj.getFileObject("VWJavaEE5");
    1.33          System.out.println("Children of VWJavaEE5:" + Arrays.toString(testApp.getChildren()));
    1.34