Bug 343308 - Moved Jface viewer tests to a local run only tests suite.

2 files changed, 61 insertions, 19 deletions

diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
index d861003da..745993e4f 100644
--- a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/AutomatedSuite.java
@@ -21,16 +21,7 @@ import org.eclipe.debug.tests.launching.LaunchManagerTests;
 import org.eclipe.debug.tests.launching.RefreshTabTests;
 import org.eclipe.debug.tests.view.memory.MemoryRenderingTests;
 import org.eclipe.debug.tests.viewer.model.ChildrenUpdateTests;
-import org.eclipe.debug.tests.viewer.model.ColumnPresentationTests;
 import org.eclipe.debug.tests.viewer.model.FilterTransformTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerCheckTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerContentTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerDeltaTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerLazyTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerSelectionTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerStateTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerTopIndexTests;
-import org.eclipe.debug.tests.viewer.model.JFaceViewerUpdateTests;
 import org.eclipe.debug.tests.viewer.model.PresentationContextTests;
 import org.eclipe.debug.tests.viewer.model.VirtualViewerContentTests;
 import org.eclipe.debug.tests.viewer.model.VirtualViewerDeltaTests;
@@ -60,16 +51,9 @@ public class AutomatedSuite extends TestSuite {
 	 * Constructs the automated test suite. Adds all tests. 
 	 */
 	public AutomatedSuite() {
-		// JFace viewer tests
-		addTest(new TestSuite(JFaceViewerCheckTests.class));
-		addTest(new TestSuite(JFaceViewerContentTests.class));
-		addTest(new TestSuite(JFaceViewerDeltaTests.class));
-		addTest(new TestSuite(JFaceViewerSelectionTests.class));
-		addTest(new TestSuite(JFaceViewerStateTests.class));
-		addTest(new TestSuite(JFaceViewerUpdateTests.class));
-        addTest(new TestSuite(JFaceViewerLazyTests.class));
-        addTest(new TestSuite(JFaceViewerTopIndexTests.class));
-        addTest(new TestSuite(ColumnPresentationTests.class));
+	    // Note: jface viewer tests were moved out of nightly tests 
+	    // due to frequent problems on nightly build machines. 
+	    // (Bug 343308). 
 		
 		// Virtual viewer tests
 		addTest(new TestSuite(VirtualViewerDeltaTests.class));
diff --git a/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java
new file mode 100644
index 000000000..bfe8ba5fa
--- /dev/null
+++ b/org.eclipse.debug.tests/src/org/eclipse/debug/tests/LocalSuite.java
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.debug.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipe.debug.tests.viewer.model.ColumnPresentationTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerCheckTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerContentTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerDeltaTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerLazyTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerSelectionTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerStateTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerTopIndexTests;
+import org.eclipe.debug.tests.viewer.model.JFaceViewerUpdateTests;
+
+/**
+ * Tests to run locally.  They require a user terminal to execute correctly 
+ * and have frequent issues when run on build machine. 
+ * 
+ * @since 3.7
+ */
+public class LocalSuite extends TestSuite {
+
+	/**
+	 * Returns the suite.  This is required to use the JUnit Launcher.
+	 * 
+	 * @return the test suite
+	 */
+	public static Test suite() {
+		return new LocalSuite();
+	}
+	
+	/**
+	 * Constructs the automated test suite. Adds all tests. 
+	 */
+	public LocalSuite() {
+		// JFace viewer tests
+		addTest(new TestSuite(JFaceViewerCheckTests.class));
+		addTest(new TestSuite(JFaceViewerContentTests.class));
+		addTest(new TestSuite(JFaceViewerDeltaTests.class));
+		addTest(new TestSuite(JFaceViewerSelectionTests.class));
+		addTest(new TestSuite(JFaceViewerStateTests.class));
+		addTest(new TestSuite(JFaceViewerUpdateTests.class));
+        addTest(new TestSuite(JFaceViewerLazyTests.class));
+        addTest(new TestSuite(JFaceViewerTopIndexTests.class));
+        addTest(new TestSuite(ColumnPresentationTests.class));
+	}
+}