Bug 369526 - Session test ordering off on java 7
Specify the test ordering
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkersViewColumnSizeTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkersViewColumnSizeTest.java
index 2b6e02a..3d9ffa0 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkersViewColumnSizeTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/markers/MarkersViewColumnSizeTest.java
@@ -11,6 +11,8 @@
package org.eclipse.ui.tests.markers;
+import junit.framework.TestSuite;
+
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;
@@ -22,12 +24,19 @@
*
*/
public class MarkersViewColumnSizeTest extends UITestCase {
+
+ public static TestSuite suite() {
+ TestSuite ts = new TestSuite();
+ ts.addTest(new MarkersViewColumnSizeTest("testColumnCreate"));
+ ts.addTest(new MarkersViewColumnSizeTest("testColumnRestore"));
+ return ts;
+ }
/**
* @param testName
*/
- public MarkersViewColumnSizeTest() {
- super("MarkersViewColumnSizeTest");
+ public MarkersViewColumnSizeTest(String name) {
+ super(name);
}
public void testColumnCreate() {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesViewTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesViewTest.java
index 8ef04d3..8949cfe 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesViewTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesViewTest.java
@@ -30,9 +30,7 @@
* @since 3.3
*/
public class ArbitraryPropertiesViewTest extends TestCase {
- /**
- *
- */
+
private static final String USER_PROP = "org.eclipse.ui.tests.users";
private static final String PROBLEM_VIEW_ID = "org.eclipse.ui.views.ProblemView";
@@ -40,7 +38,11 @@
private static final String VIEW_WITH_STATE_ID = "org.eclipse.ui.tests.session.ViewWithState";
public static TestSuite suite() {
- return new TestSuite(ArbitraryPropertiesViewTest.class);
+ TestSuite ts = new TestSuite();
+ ts.addTest(new ArbitraryPropertiesViewTest("test01ActivateView"));
+ ts.addTest(new ArbitraryPropertiesViewTest("test02SecondOpening"));
+ ts.addTest(new ArbitraryPropertiesViewTest("test03PartInstantiation"));
+ return ts;
}
public ArbitraryPropertiesViewTest(String testName) {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug108033Test.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug108033Test.java
index 78d8555..cbd0a10 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug108033Test.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug108033Test.java
@@ -11,6 +11,7 @@
package org.eclipse.ui.tests.session;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.eclipse.ui.IPerspectiveDescriptor;
import org.eclipse.ui.IViewPart;
@@ -36,6 +37,14 @@
*
*/
public class Bug108033Test extends TestCase {
+
+ public static TestSuite suite() {
+ TestSuite ts = new TestSuite();
+ ts.addTest(new Bug108033Test("testShowMultipleViews"));
+ ts.addTest(new Bug108033Test("testCheckMultipleViews"));
+ ts.addTest(new Bug108033Test("testMovedMultipleViews"));
+ return ts;
+ }
public static final String PROBLEM_VIEW_ID = "org.eclipse.ui.views.ProblemView";
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug95357Test.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug95357Test.java
index efcfd25..bab3a11 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug95357Test.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug95357Test.java
@@ -11,6 +11,7 @@
package org.eclipse.ui.tests.session;
import junit.framework.TestCase;
+import junit.framework.TestSuite;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -45,6 +46,18 @@
*
*/
public class Bug95357Test extends TestCase {
+ public static TestSuite suite() {
+ TestSuite ts = new TestSuite();
+ ts.addTest(new Bug95357Test("testMultipleEditors"));
+ ts.addTest(new Bug95357Test("testMultipleEditorsOpen"));
+ ts.addTest(new Bug95357Test("testMultipleStacks"));
+ ts.addTest(new Bug95357Test("testMultipleStacksOnStartup"));
+ ts.addTest(new Bug95357Test("testMultipleEditorsSession"));
+ ts.addTest(new Bug95357Test("testMultipleEditorsOpenSession"));
+ ts.addTest(new Bug95357Test("testMultipleStacksSession"));
+ ts.addTest(new Bug95357Test("testMultipleStacksOnStartupSession"));
+ return ts;
+ }
private static final String BUG95357PROJECT = "Bug95357project";
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug98800Test.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug98800Test.java
index 31ee6c1..2301c2e 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug98800Test.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/Bug98800Test.java
@@ -31,7 +31,11 @@
private static final String VIEW_WITH_STATE_ID = "org.eclipse.ui.tests.session.ViewWithState";
public static TestSuite suite() {
- return new TestSuite(Bug98800Test.class);
+ TestSuite ts = new TestSuite();
+ ts.addTest(new Bug98800Test("testActivateView"));
+ ts.addTest(new Bug98800Test("testSecondOpening"));
+ ts.addTest(new Bug98800Test("testSavedMemento"));
+ return ts;
}
private IWorkbenchPage fPage;
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/SessionTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/SessionTests.java
index e08e96a..3257b1e 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/SessionTests.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/SessionTests.java
@@ -99,10 +99,11 @@
* Add editor tests that involve starting and stopping sessions.
*/
private void addEditorTests() {
- addTest(new WorkbenchSessionTest("editorSessionTests",
- Bug95357Test.class));
-
WorkbenchSessionTest test = new WorkbenchSessionTest("editorSessionTests");
+ test.addTest(Bug95357Test.suite());
+ addTest(test);
+
+ test = new WorkbenchSessionTest("editorSessionTests");
test.addTest(EditorWithStateTest.suite());
addTest(test);
@@ -135,17 +136,25 @@
* workspace for these particular session tests.
*/
private void addViewStateTests() {
- addTest(new WorkbenchSessionTest("editorSessionTests",
- Bug98800Test.class));
- addTest(new WorkbenchSessionTest("editorSessionTests",
- Bug108033Test.class));
- addTest(new WorkbenchSessionTest("editorSessionTests",
- ArbitraryPropertiesViewTest.class));
+ WorkbenchSessionTest test = new WorkbenchSessionTest("editorSessionTests");
+ test.addTest(Bug98800Test.suite());
+ addTest(test);
+
+ test = new WorkbenchSessionTest("editorSessionTests");
+ test.addTest(Bug108033Test.suite());
+ addTest(test);
+
+ test = new WorkbenchSessionTest("editorSessionTests");
+ test.addTest(ArbitraryPropertiesViewTest.suite());
+ addTest(test);
+
addTest(new WorkbenchSessionTest("editorSessionTests",
NonRestorableViewTest.class));
addTest(new WorkbenchSessionTest("editorSessionTests",
NonRestorablePropertySheetTest.class));
- addTest(new WorkbenchSessionTest("editorSessionTests",
- MarkersViewColumnSizeTest.class));
+
+ test = new WorkbenchSessionTest("editorSessionTests");
+ test.addTest(MarkersViewColumnSizeTest.suite());
+ addTest(test);
}
}
