1.1 --- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/ProjectOnDemandTest.java	Thu Jan 14 22:07:23 2010 +0100
     1.2 +++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/ProjectOnDemandTest.java	Fri Jan 15 07:04:26 2010 +0100
     1.3 @@ -49,13 +49,10 @@
     1.4  import java.util.Collections;
     1.5  import java.util.List;
     1.6  import junit.framework.Test;
     1.7 -import org.netbeans.Module;
     1.8 -import org.netbeans.ModuleManager;
     1.9  import org.netbeans.api.project.Project;
    1.10  import org.netbeans.api.project.ProjectInformation;
    1.11  import org.netbeans.api.project.ProjectManager;
    1.12  import org.netbeans.api.project.ui.OpenProjects;
    1.13 -import org.netbeans.core.startup.Main;
    1.14  import org.netbeans.junit.NbModuleSuite;
    1.15  import org.netbeans.junit.NbTestCase;
    1.16  import org.netbeans.spi.project.ui.LogicalViewProvider;
    1.17 @@ -99,8 +96,6 @@
    1.18          return NbModuleSuite.create(
    1.19              NbModuleSuite.emptyConfiguration().
    1.20              addTest(ProjectOnDemandTest.class).
    1.21 -            clusters("ergonomics[0-9]*").
    1.22 -            clusters("ide[0-9]*|java[0-9]*").
    1.23              gui(false)
    1.24          );
    1.25      }
    1.26 @@ -119,7 +114,25 @@
    1.27          boolean found = false;
    1.28          Exception ex2 = null;
    1.29          for (ModuleInfo info : Lookup.getDefault().lookupAll(ModuleInfo.class)) {
    1.30 -            if (info.getCodeNameBase().equals("org.netbeans.modules.java.kit")) {
    1.31 +            if (info.getCodeNameBase().equals("org.netbeans.modules.subversion")) {
    1.32 +             Method m = null;
    1.33 +                Class<?> c = info.getClass();
    1.34 +                for (;;) {
    1.35 +                    if (c == null) {
    1.36 +                        throw ex2;
    1.37 +                    }
    1.38 +                    try {
    1.39 +                        m = c.getDeclaredMethod("setEnabled", Boolean.TYPE);
    1.40 +                    } catch (Exception ex) {
    1.41 +                        ex2 = ex;
    1.42 +                    }
    1.43 +                    if (m != null) {
    1.44 +                        break;
    1.45 +                    }
    1.46 +                    c = c.getSuperclass();
    1.47 +                }
    1.48 +                m.setAccessible(true);
    1.49 +                m.invoke(info, false);
    1.50                  assertFalse("Module is disabled", info.isEnabled());
    1.51                  found = true;
    1.52              }
    1.53 @@ -188,15 +201,9 @@
    1.54          assertNull("No test factory in project", p.getLookup().lookup(TestFactory.class));
    1.55          assertNull("No test factory in project", p2.getLookup().lookup(TestFactory.class));
    1.56  
    1.57 -        long before = System.currentTimeMillis();
    1.58 -        Thread.sleep(1000);
    1.59 -
    1.60          TestFactory.recognize.add(prjFO1);
    1.61          TestFactory.recognize.add(prjFO2);
    1.62          OpenProjects.getDefault().open(new Project[] { p }, false);
    1.63 -
    1.64 -        Thread.sleep(1000);
    1.65 -        long after = System.currentTimeMillis();
    1.66          
    1.67          assertEquals("No Dialog currently created", 0, DD.cnt);
    1.68          
    1.69 @@ -235,18 +242,6 @@
    1.70  
    1.71          assertNotNull("Test factory in opened project", p.getLookup().lookup(TestFactory.class));
    1.72          assertNotNull("Test factory in not yet opened project", p2.getLookup().lookup(TestFactory.class));
    1.73 -
    1.74 -        FileObject sub = FileUtil.getConfigFile("Modules/org-netbeans-modules-subversion.xml");
    1.75 -        assertNotNull("Module config file found", sub);
    1.76 -        final Object when = sub.getAttribute("ergonomicsEnabled");
    1.77 -        final Object cnt = sub.getAttribute("ergonomicsUnused");
    1.78 -        assertNotNull("Not enabled manually", cnt);
    1.79 -        assertNotNull("Not enabled manually", when);
    1.80 -        assertEquals("Integer", Integer.class, cnt.getClass());
    1.81 -        assertEquals("Set to zero", Integer.valueOf(0), cnt);
    1.82 -
    1.83 -        Long modified = sub.lastModified().getTime();
    1.84 -        assertEquals("enabled attribute is same as modification day", when, modified);
    1.85      }
    1.86  
    1.87      public void propertyChange(PropertyChangeEvent evt) {

     2.1 --- a/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/TestBundle.properties	Thu Jan 14 22:07:23 2010 +0100
     2.2 +++ b/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/fod/TestBundle.properties	Fri Jan 15 07:04:26 2010 +0100
     2.3 @@ -37,6 +37,6 @@
     2.4  
     2.5  Actions/Test/testIconIsCorrect.instance=Icon &Name Action
     2.6  
     2.7 -cnbs=org.netbeans.modules.java.kit
     2.8 +cnbs=org.netbeans.modules.subversion
     2.9  project.file.dbproject/project.properties=SomeClass
    2.10