diff options
| author | Paul Webster | 2012-01-25 16:52:43 +0000 |
|---|---|---|
| committer | Paul Webster | 2012-01-25 16:52:43 +0000 |
| commit | 49c318a18ae5ed2a2edb0c6235c132e2d4648891 (patch) | |
| tree | be6c4331608926c5c964821c3162c1cb08f844e2 | |
| parent | 43e22ad618cdf4258334dd8f3327b639dc1090fc (diff) | |
| download | eclipse.platform.ui-49c318a18ae5ed2a2edb0c6235c132e2d4648891.tar.gz eclipse.platform.ui-49c318a18ae5ed2a2edb0c6235c132e2d4648891.tar.xz eclipse.platform.ui-49c318a18ae5ed2a2edb0c6235c132e2d4648891.zip | |
Bug 369526 - Session test ordering off on java 7v20120125-1652
Explicitly specify the order of all of the session tests.
16 files changed, 113 insertions, 33 deletions
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 3d9ffa0fca4..efb60beae77 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 @@ -26,7 +26,7 @@ import org.eclipse.ui.tests.harness.util.UITestCase; public class MarkersViewColumnSizeTest extends UITestCase { public static TestSuite suite() { - TestSuite ts = new TestSuite(); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.markers.MarkersViewColumnSizeTest"); ts.addTest(new MarkersViewColumnSizeTest("testColumnCreate")); ts.addTest(new MarkersViewColumnSizeTest("testColumnRestore")); return ts; diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesEditorTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesEditorTest.java index d711e170513..bce58c1fec6 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesEditorTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ArbitraryPropertiesEditorTest.java @@ -37,15 +37,16 @@ import org.eclipse.ui.tests.harness.util.FileUtil; * @since 3.3 */ public class ArbitraryPropertiesEditorTest extends TestCase { - /** - * - */ private static final String USER_PROP = "org.eclipse.ui.tests.users"; private static final String EDITOR_ID = "org.eclipse.ui.tests.TitleTestEditor"; public static TestSuite suite() { - return new TestSuite(ArbitraryPropertiesEditorTest.class); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.ArbitraryPropertiesEditorTest"); + ts.addTest(new ArbitraryPropertiesEditorTest("testOpenEditor")); + ts.addTest(new ArbitraryPropertiesEditorTest("testSecondOpening")); + ts.addTest(new ArbitraryPropertiesEditorTest("testPartInstantiation")); + return ts; } public ArbitraryPropertiesEditorTest(String testName) { 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 8949cfec584..33a45b32522 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 @@ -38,7 +38,7 @@ public class ArbitraryPropertiesViewTest extends TestCase { private static final String VIEW_WITH_STATE_ID = "org.eclipse.ui.tests.session.ViewWithState"; public static TestSuite suite() { - TestSuite ts = new TestSuite(); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.ArbitraryPropertiesViewTest"); ts.addTest(new ArbitraryPropertiesViewTest("test01ActivateView")); ts.addTest(new ArbitraryPropertiesViewTest("test02SecondOpening")); ts.addTest(new ArbitraryPropertiesViewTest("test03PartInstantiation")); 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 cbd0a10a604..339315cbb5a 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 @@ -39,7 +39,7 @@ import org.eclipse.ui.presentations.IPresentablePart; public class Bug108033Test extends TestCase { public static TestSuite suite() { - TestSuite ts = new TestSuite(); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.Bug108033Test"); ts.addTest(new Bug108033Test("testShowMultipleViews")); ts.addTest(new Bug108033Test("testCheckMultipleViews")); ts.addTest(new Bug108033Test("testMovedMultipleViews")); 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 bab3a11909a..f83076f6abb 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 @@ -47,7 +47,7 @@ import org.eclipse.ui.tests.harness.util.FileUtil; */ public class Bug95357Test extends TestCase { public static TestSuite suite() { - TestSuite ts = new TestSuite(); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.Bug95357Test"); ts.addTest(new Bug95357Test("testMultipleEditors")); ts.addTest(new Bug95357Test("testMultipleEditorsOpen")); ts.addTest(new Bug95357Test("testMultipleStacks")); 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 2301c2e5b65..54aae8107ca 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,7 @@ public class Bug98800Test extends TestCase { private static final String VIEW_WITH_STATE_ID = "org.eclipse.ui.tests.session.ViewWithState"; public static TestSuite suite() { - TestSuite ts = new TestSuite(); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.Bug98800Test"); ts.addTest(new Bug98800Test("testActivateView")); ts.addTest(new Bug98800Test("testSecondOpening")); ts.addTest(new Bug98800Test("testSavedMemento")); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/HandlerStateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/HandlerStateTest.java index ba9534d3007..ab4a8c6dd8f 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/HandlerStateTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/HandlerStateTest.java @@ -11,6 +11,7 @@ package org.eclipse.ui.tests.session; import junit.framework.TestCase; +import junit.framework.TestSuite; import org.eclipse.core.commands.Command; import org.eclipse.core.commands.State; @@ -25,6 +26,13 @@ import org.eclipse.ui.commands.ICommandService; * @since 3.2 */ public class HandlerStateTest extends TestCase { + + public static TestSuite suite() { + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.HandlerStateTest"); + ts.addTest(new HandlerStateTest("testInitialHandlerState")); + ts.addTest(new HandlerStateTest("testModifiedHandlerState")); + return ts; + } /** * The identifier of the command with state that we wish to test. diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/IntroSessionTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/IntroSessionTests.java index c641550f6e8..92b75e4e2d5 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/IntroSessionTests.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/IntroSessionTests.java @@ -11,6 +11,7 @@ package org.eclipse.ui.tests.session; import junit.framework.TestCase; +import junit.framework.TestSuite; import org.eclipse.ui.PlatformUI; @@ -21,6 +22,12 @@ import org.eclipse.ui.PlatformUI; */ public class IntroSessionTests extends TestCase { + public static TestSuite suite() { + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.IntroSessionTests"); + ts.addTest(new IntroSessionTests("testIntro")); + return ts; + } + /** * @param name */ diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorablePropertySheetTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorablePropertySheetTest.java index 199ae8b7bfb..e98c2ff5581 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorablePropertySheetTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorablePropertySheetTest.java @@ -32,7 +32,10 @@ import org.eclipse.ui.views.properties.PropertySheet; public class NonRestorablePropertySheetTest extends TestCase { public static TestSuite suite() { - return new TestSuite(NonRestorablePropertySheetTest.class); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.NonRestorablePropertySheetTest"); + ts.addTest(new NonRestorablePropertySheetTest("test01ActivateView")); + ts.addTest(new NonRestorablePropertySheetTest("test02SecondOpening")); + return ts; } public NonRestorablePropertySheetTest(String testName) { diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorableViewTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorableViewTest.java index e2ba79fb4f3..cf27a6a1ead 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorableViewTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/NonRestorableViewTest.java @@ -31,7 +31,10 @@ public class NonRestorableViewTest extends TestCase { private static final String NON_RESTORABLE_VIEW_ID = "org.eclipse.ui.tests.session.NonRestorableView"; public static TestSuite suite() { - return new TestSuite(NonRestorableViewTest.class); + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.NonRestorableViewTest"); + ts.addTest(new NonRestorableViewTest("test01ActivateView")); + ts.addTest(new NonRestorableViewTest("test02SecondOpening")); + return ts; } public NonRestorableViewTest(String testName) { diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/RestoreSessionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/RestoreSessionTest.java index 8e1af8b3a43..03b7f5f2c19 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/RestoreSessionTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/RestoreSessionTest.java @@ -13,12 +13,18 @@ package org.eclipse.ui.tests.session; import org.eclipse.ui.tests.harness.util.RCPTestWorkbenchAdvisor; import junit.framework.TestCase; +import junit.framework.TestSuite; /** * @since 3.5 */ public class RestoreSessionTest extends TestCase { + public static TestSuite suite() { + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.RestoreSessionTest"); + ts.addTest(new RestoreSessionTest("testDisplayAccess")); + return ts; + } public RestoreSessionTest(String name) { super(name); 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 3257b1e9316..8bd6e53b8fc 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 @@ -54,12 +54,16 @@ public class SessionTests extends TestSuite { * */ private void addWindowlessSessionTest() { - // Windowless apps are available only on Cocoa - if(Util.isCocoa()) { + // Windowless apps are available only on Cocoa + if (Util.isCocoa()) { Map arguments = new HashMap(2); arguments.put("product", null); - arguments.put("testApplication", "org.eclipse.ui.tests.windowLessRcpApplication"); - addTest(new WorkbenchSessionTest("windowlessSessionTests",WindowlessSessionTest.class, arguments)); + arguments.put("testApplication", + "org.eclipse.ui.tests.windowLessRcpApplication"); + WorkbenchSessionTest test = new WorkbenchSessionTest( + "windowlessSessionTests", arguments); + test.addTest(WindowlessSessionTest.suite()); + addTest(test); } } @@ -68,8 +72,9 @@ public class SessionTests extends TestSuite { */ private void addStatusHandlingTests() { //actually we do not care which workspace is used - addTest(new StatusHandlerConfigurationSuite("themeSessionTests", - StatusHandlingConfigurationTest.class)); + StatusHandlerConfigurationSuite test = new StatusHandlerConfigurationSuite("themeSessionTests"); + test.addTest(StatusHandlingConfigurationTest.suite()); + addTest(test); } /** @@ -83,16 +88,18 @@ public class SessionTests extends TestSuite { * */ private void addThemeTests() { - addTest(new WorkbenchSessionTest("themeSessionTests", - ThemeStateTest.class)); - + WorkbenchSessionTest test = new WorkbenchSessionTest("themeSessionTests"); + test.addTest(ThemeStateTest.suite()); + addTest(test); } private void addRestoredSessionTest() { Map arguments = new HashMap(2); arguments.put("product", null); arguments.put("testApplication", "org.eclipse.ui.tests.rcpSessionApplication"); - addTest(new WorkbenchSessionTest("introSessionTests",RestoreSessionTest.class, arguments)); + WorkbenchSessionTest test = new WorkbenchSessionTest("introSessionTests", arguments); + test.addTest(RestoreSessionTest.suite()); + addTest(test); } /** @@ -107,8 +114,9 @@ public class SessionTests extends TestSuite { test.addTest(EditorWithStateTest.suite()); addTest(test); - addTest(new WorkbenchSessionTest("editorSessionTests", - ArbitraryPropertiesEditorTest.class)); + test = new WorkbenchSessionTest("editorSessionTests"); + test.addTest(ArbitraryPropertiesEditorTest.suite()); + addTest(test); } /** @@ -117,16 +125,18 @@ public class SessionTests extends TestSuite { * @since 3.2 */ private void addHandlerStateTests() { - addTest(new WorkbenchSessionTest("editorSessionTests", - HandlerStateTest.class)); + WorkbenchSessionTest test = new WorkbenchSessionTest("editorSessionTests"); + test.addTest(HandlerStateTest.suite()); + addTest(test); } /** * Adds intro related session tests. */ private void addIntroTests() { - addTest(new WorkbenchSessionTest("introSessionTests", - IntroSessionTests.class)); + WorkbenchSessionTest test = new WorkbenchSessionTest("introSessionTests"); + test.addTest(IntroSessionTests.suite()); + addTest(test); } /** @@ -148,10 +158,13 @@ public class SessionTests extends TestSuite { test.addTest(ArbitraryPropertiesViewTest.suite()); addTest(test); - addTest(new WorkbenchSessionTest("editorSessionTests", - NonRestorableViewTest.class)); - addTest(new WorkbenchSessionTest("editorSessionTests", - NonRestorablePropertySheetTest.class)); + test = new WorkbenchSessionTest("editorSessionTests"); + test.addTest(NonRestorableViewTest.suite()); + addTest(test); + + test = new WorkbenchSessionTest("editorSessionTests"); + test.addTest(NonRestorablePropertySheetTest.suite()); + addTest(test); test = new WorkbenchSessionTest("editorSessionTests"); test.addTest(MarkersViewColumnSizeTest.suite()); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ThemeStateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ThemeStateTest.java index 8cf5a2d771c..3d141035648 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ThemeStateTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/ThemeStateTest.java @@ -11,17 +11,23 @@ package org.eclipse.ui.tests.session; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.eclipse.ui.PlatformUI; import org.eclipse.ui.themes.IThemeManager; -import junit.framework.TestCase; - /** * Tests various persistent theme properties. * * @since 3.4 */ public class ThemeStateTest extends TestCase { + public static TestSuite suite() { + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.ThemeStateTest"); + ts.addTest(new ThemeStateTest("testBadPreference")); + return ts; + } public ThemeStateTest(final String name) { super(name); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WindowlessSessionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WindowlessSessionTest.java index 869556df92a..26ef0a1be91 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WindowlessSessionTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WindowlessSessionTest.java @@ -11,6 +11,8 @@ ******************************************************************************/ package org.eclipse.ui.tests.session; +import junit.framework.TestSuite; + import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.tests.harness.util.UITestCase; @@ -19,6 +21,11 @@ import org.eclipse.ui.tests.harness.util.UITestCase; * @since 3.7 */ public class WindowlessSessionTest extends UITestCase { + public static TestSuite suite() { + TestSuite ts = new TestSuite("org.eclipse.ui.tests.session.WindowlessSessionTest"); + ts.addTest(new WindowlessSessionTest("testWindowlessWorkbench")); + return ts; + } public WindowlessSessionTest(String name) { super(name); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java index b04e737a742..3f8fe057ee4 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/session/WorkbenchSessionTest.java @@ -61,6 +61,20 @@ public class WorkbenchSessionTest extends SessionTestSuite { * @param dataLocation * the location of the workspace to test, relative to * data/workspaces + * @param arguments + * a map of arguments to use + */ + public WorkbenchSessionTest(String dataLocation, Map arguments) { + this(dataLocation); + this.arguments = arguments; + } + + /** + * Create a new workbench session test. + * + * @param dataLocation + * the location of the workspace to test, relative to + * data/workspaces * @param clazz * the <code>Test</code> class */ diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingConfigurationTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingConfigurationTest.java index 618e98e9413..733c917b48c 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingConfigurationTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/statushandlers/StatusHandlingConfigurationTest.java @@ -20,12 +20,24 @@ import org.eclipse.ui.statushandlers.StatusManager; import org.eclipse.ui.statushandlers.StatusManager.INotificationTypes; import junit.framework.TestCase; +import junit.framework.TestSuite; /** * @since 3.5 * */ public class StatusHandlingConfigurationTest extends TestCase { + public static TestSuite suite() { + TestSuite ts = new TestSuite("org.eclipse.ui.tests.statushandlers.StatusHandlingConfigurationTest"); + ts.addTest(new StatusHandlingConfigurationTest("testFreeStatusHandler")); + ts.addTest(new StatusHandlingConfigurationTest("testDefaultNotification")); + return ts; + } + + public StatusHandlingConfigurationTest(String name) { + super(name); + } + public void testFreeStatusHandler(){ final StatusAdapter adapter = new StatusAdapter(new Status(IStatus.ERROR,"fakeplugin","testmessage")); final boolean[] called = new boolean[]{false}; |
