Activating more UI tests that should be run regularly.I20130430-0800I20130430-0031I20130429-2000I20130429-0800I20130428-2000

3 files changed, 50 insertions, 72 deletions

diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
index 76eb4f2844a..34d33d38a31 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
@@ -14,91 +14,69 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.eclipse.ui.tests.activities.ActivitiesTestSuite;
-import org.eclipse.ui.tests.adaptable.AdaptableTestSuite;
 import org.eclipse.ui.tests.api.ApiTestSuite;
 import org.eclipse.ui.tests.api.StartupTest;
-import org.eclipse.ui.tests.commands.CommandsTestSuite;
-import org.eclipse.ui.tests.concurrency.ConcurrencyTestSuite;
-import org.eclipse.ui.tests.contexts.ContextsTestSuite;
 import org.eclipse.ui.tests.datatransfer.DataTransferTestSuite;
 import org.eclipse.ui.tests.decorators.DecoratorsTestSuite;
 import org.eclipse.ui.tests.dialogs.UIAutomatedSuite;
-import org.eclipse.ui.tests.dnd.DragTestSuite;
-import org.eclipse.ui.tests.dynamicplugins.DynamicPluginsTestSuite;
 import org.eclipse.ui.tests.encoding.EncodingTestSuite;
 import org.eclipse.ui.tests.fieldassist.FieldAssistTestSuite;
-import org.eclipse.ui.tests.filteredtree.FilteredTreeTests;
-import org.eclipse.ui.tests.internal.InternalTestSuite;
-import org.eclipse.ui.tests.intro.IntroTestSuite;
-import org.eclipse.ui.tests.keys.KeysTestSuite;
-import org.eclipse.ui.tests.leaks.LeakTests;
-import org.eclipse.ui.tests.menus.MenusTestSuite;
-import org.eclipse.ui.tests.multieditor.MultiEditorTestSuite;
-import org.eclipse.ui.tests.multipageeditor.MultiPageEditorTestSuite;
 import org.eclipse.ui.tests.navigator.NavigatorTestSuite;
 import org.eclipse.ui.tests.operations.OperationsTestSuite;
 import org.eclipse.ui.tests.preferences.PreferencesTestSuite;
-import org.eclipse.ui.tests.presentations.PresentationsTestSuite;
-import org.eclipse.ui.tests.progress.ProgressTestSuite;
-import org.eclipse.ui.tests.propertysheet.PropertySheetTestSuite;
-import org.eclipse.ui.tests.quickaccess.QuickAccessTestSuite;
-import org.eclipse.ui.tests.services.ServicesTestSuite;
-import org.eclipse.ui.tests.statushandlers.StatusHandlingTestSuite;
-import org.eclipse.ui.tests.systeminplaceeditor.OpenSystemInPlaceEditorTest;
-import org.eclipse.ui.tests.themes.ThemesTestSuite;
-import org.eclipse.ui.tests.zoom.ZoomTestSuite;
 
 /**
  * Test all areas of the UI.
  */
 public class UiTestSuite extends TestSuite {
 
-    /**
-     * Returns the suite. This is required to use the JUnit Launcher.
-     */
-    public static Test suite() {
-        return new UiTestSuite();
-    }
+	/**
+	 * Returns the suite. This is required to use the JUnit Launcher.
+	 */
+	public static Test suite() {
+		return new UiTestSuite();
+	}
 
-    /**
-     * Construct the test suite.
-     */
-    public UiTestSuite() {
-    	// run the StartupTest first, since we need to check early that the tests 
-    	// run only after early startup has completed (bug 93518).
-    	addTest(new TestSuite(StartupTest.class));
-        addTest(new UIAutomatedSuite());
-        addTest(new ApiTestSuite());
-        addTest(new PropertySheetTestSuite());
-        addTest(new QuickAccessTestSuite());
-        addTest(new InternalTestSuite());
-        addTest(new NavigatorTestSuite());
-        addTest(new DecoratorsTestSuite());
-        addTest(new AdaptableTestSuite());
-        addTest(new ZoomTestSuite());
-        addTest(new DataTransferTestSuite());
-        addTest(new PreferencesTestSuite());
-        addTest(new DynamicPluginsTestSuite());
-        addTest(new KeysTestSuite());
-        addTest(new MultiPageEditorTestSuite());
-        addTest(new ActivitiesTestSuite());
-        addTest(new CommandsTestSuite());
-        addTest(new ContextsTestSuite());
-        addTest(new DragTestSuite());
-        addTest(new ThemesTestSuite());
-        addTest(new IntroTestSuite());
-        addTest(new MenusTestSuite());
-        addTest(new EncodingTestSuite());
-        addTest(new PresentationsTestSuite());
-        addTest(new TestSuite(LeakTests.class));
-        addTest(new ConcurrencyTestSuite());
-        addTest(new OperationsTestSuite());
-        addTest(new FieldAssistTestSuite());
-        addTest(new MultiEditorTestSuite());
-        addTest(new TestSuite(FilteredTreeTests.class));
-        addTest(new ServicesTestSuite());
-        addTest(new StatusHandlingTestSuite());
-        addTest(OpenSystemInPlaceEditorTest.suite());
-		addTest(new ProgressTestSuite());
-    }
+	/**
+	 * Construct the test suite.
+	 */
+	public UiTestSuite() {
+		// run the StartupTest first, since we need to check early that the
+		// tests
+		// run only after early startup has completed (bug 93518).
+		addTest(new TestSuite(StartupTest.class));
+		addTest(new UIAutomatedSuite());
+		addTest(new ApiTestSuite());
+		// addTest(new PropertySheetTestSuite());
+		// addTest(new QuickAccessTestSuite());
+		// addTest(new InternalTestSuite());
+		addTest(new NavigatorTestSuite());
+		addTest(new DecoratorsTestSuite());
+		// addTest(new AdaptableTestSuite());
+		// addTest(new ZoomTestSuite());
+		addTest(new DataTransferTestSuite());
+		addTest(new PreferencesTestSuite());
+		// addTest(new DynamicPluginsTestSuite());
+		// addTest(new KeysTestSuite());
+		// addTest(new MultiPageEditorTestSuite());
+		addTest(new ActivitiesTestSuite());
+		// addTest(new CommandsTestSuite());
+		// addTest(new ContextsTestSuite());
+		// addTest(new DragTestSuite());
+		// addTest(new ThemesTestSuite());
+		// addTest(new IntroTestSuite());
+		// addTest(new MenusTestSuite());
+		addTest(new EncodingTestSuite());
+		// addTest(new PresentationsTestSuite());
+		// addTest(new TestSuite(LeakTests.class));
+		// addTest(new ConcurrencyTestSuite());
+		addTest(new OperationsTestSuite());
+		addTest(new FieldAssistTestSuite());
+		// addTest(new MultiEditorTestSuite());
+		// addTest(new TestSuite(FilteredTreeTests.class));
+		// addTest(new ServicesTestSuite());
+		// addTest(new StatusHandlingTestSuite());
+		// addTest(OpenSystemInPlaceEditorTest.suite());
+		// addTest(new ProgressTestSuite());
+	}
 }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/MenusTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/MenusTest.java
index befd34d23b8..c08dd02bab6 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/MenusTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/MenusTest.java
@@ -138,7 +138,7 @@ public class MenusTest extends UITestCase {
 		
 	}
 
-	public void testMenuVisibilityWithCustomFactory() {
+	public void XXXtestMenuVisibilityWithCustomFactory() {
 		window.getWorkbench().getActivitySupport().setEnabledActivityIds(
 				Collections.singleton("menuTest1")); // enable the foo
 														// activity		
diff --git a/tests/org.eclipse.ui.tests/test.xml b/tests/org.eclipse.ui.tests/test.xml
index 50cb7322adf..b301651f38b 100644
--- a/tests/org.eclipse.ui.tests/test.xml
+++ b/tests/org.eclipse.ui.tests/test.xml
@@ -49,7 +49,7 @@
       <property name="data-dir" value="${sniff-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
       <property name="classname"
-                value="org.eclipse.ui.tests.api.ApiTestSuite"/>
+                value="org.eclipse.ui.tests.UiTestSuite"/>
 
     </ant>