From be23b014d8d8534cdd7264d4bc026a34af8c35f6 Mon Sep 17 00:00:00 2001 From: Oleg Besedin Date: Wed, 25 Jan 2012 14:02:28 -0500 Subject: Bug 369660 - Failures in UITestSuite in I20120124-2000 --- .../ui/tests/adaptable/AdaptableDecoratorTestCase.java | 10 ++++++++++ .../org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java | 2 +- .../org/eclipse/ui/tests/commands/CommandsTestSuite.java | 2 +- .../org/eclipse/ui/tests/commands/ToggleStateTest.java | 10 ++++++++++ .../eclipse/ui/tests/decorators/DecoratorAdaptableTests.java | 10 ++++++++++ .../org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java | 2 +- .../org/eclipse/ui/tests/services/ContributedServiceTest.java | 11 +++++++++++ .../org/eclipse/ui/tests/services/ServicesTestSuite.java | 2 +- 8 files changed, 45 insertions(+), 4 deletions(-) mode change 100755 => 100644 tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableDecoratorTestCase.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableDecoratorTestCase.java index 58000c0b878..c90e587d3fc 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableDecoratorTestCase.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableDecoratorTestCase.java @@ -12,6 +12,8 @@ package org.eclipse.ui.tests.adaptable; import java.io.ByteArrayInputStream; +import junit.framework.TestSuite; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; @@ -47,6 +49,14 @@ public class AdaptableDecoratorTestCase extends UITestCase implements protected IFile testFile; + public static TestSuite suite() { + TestSuite ts = new TestSuite(); + ts.addTest(new AdaptableDecoratorTestCase("testEnableDecorator")); + ts.addTest(new AdaptableDecoratorTestCase("testDisableDecorator")); + ts.addTest(new AdaptableDecoratorTestCase("testRefreshFullContributor")); + ts.addTest(new AdaptableDecoratorTestCase("testRefreshLightContributor")); + return ts; + } /** * Constructor for DecoratorTestCase. * diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java index 8f123121d88..03c445ef1cf 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableTestSuite.java @@ -31,7 +31,7 @@ public class AdaptableTestSuite extends TestSuite { * Constructor for AdaptableTestSuite. */ public AdaptableTestSuite() { - addTest(new TestSuite(AdaptableDecoratorTestCase.class)); + addTest(AdaptableDecoratorTestCase.suite()); addTest(new TestSuite(MarkerImageProviderTest.class)); addTest(new TestSuite(WorkingSetTestCase.class)); addTest(new TestSuite(SelectionAdapterTest.class)); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java index daab90ef0e7..cd697015cd4 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/CommandsTestSuite.java @@ -46,7 +46,7 @@ public final class CommandsTestSuite extends TestSuite { addTest(new TestSuite(CommandEnablementTest.class)); addTest(new TestSuite(CommandActionTest.class)); addTest(new TestSuite(ActionDelegateProxyTest.class)); - addTest(new TestSuite(ToggleStateTest.class)); + addTest(ToggleStateTest.suite()); addTest(new TestSuite(RadioStateTest.class)); } } diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/ToggleStateTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/ToggleStateTest.java index e310d29b80b..f4b41fbd1a4 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/ToggleStateTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/commands/ToggleStateTest.java @@ -11,6 +11,8 @@ package org.eclipse.ui.tests.commands; +import junit.framework.TestSuite; + import org.eclipse.core.commands.Command; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.Parameterization; @@ -36,6 +38,14 @@ public class ToggleStateTest extends UITestCase { private IHandlerService handlerService; + public static TestSuite suite() { + TestSuite ts = new TestSuite(); + ts.addTest(new ToggleStateTest("testDefaultValues")); + ts.addTest(new ToggleStateTest("testExceptionThrown")); + ts.addTest(new ToggleStateTest("testMultipleContributions")); + return ts; + } + public ToggleStateTest(String testName) { super(testName); } diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java index 866a776babf..9ac35b06ec8 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorAdaptableTests.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.ui.tests.decorators; +import junit.framework.TestSuite; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IWorkspace; @@ -27,6 +29,14 @@ import org.eclipse.ui.tests.menus.ObjectContributionClasses.ICommon; public class DecoratorAdaptableTests extends UITestCase { + public static TestSuite suite() { + TestSuite ts = new TestSuite(); + ts.addTest(new DecoratorAdaptableTests("testAdaptables")); + ts.addTest(new DecoratorAdaptableTests("testNonAdaptableContributions")); + ts.addTest(new DecoratorAdaptableTests("testContributorResourceAdapter")); + return ts; + } + public DecoratorAdaptableTests(String testName) { super(testName); } diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java index 6a969cc9d03..7333978b4f9 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorsTestSuite.java @@ -34,7 +34,7 @@ public class DecoratorsTestSuite extends TestSuite { // addTest(new TestSuite(DecoratorTreeTest.class)); // addTest(new TestSuite(DecoratorTableTest.class)); // addTest(new TestSuite(DecoratorTableTreeTest.class)); - addTest(new TestSuite(DecoratorAdaptableTests.class)); + addTest(DecoratorAdaptableTests.suite()); addTest(new TestSuite(DecoratorCacheTest.class)); } diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java index e88dced05e7..142f5a13396 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ContributedServiceTest.java @@ -11,6 +11,8 @@ package org.eclipse.ui.tests.services; +import junit.framework.TestSuite; + import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.eclipse.ui.IWorkbenchWindow; @@ -31,6 +33,15 @@ import org.eclipse.ui.tests.harness.util.UITestCase; */ public class ContributedServiceTest extends UITestCase { + public static TestSuite suite() { + TestSuite ts = new TestSuite(); + ts.addTest(new ContributedServiceTest("testGlobalService")); + ts.addTest(new ContributedServiceTest("testWindowService")); + ts.addTest(new ContributedServiceTest("testLocalServiceCreated")); + ts.addTest(new ContributedServiceTest("testLocalDialogService")); + ts.addTest(new ContributedServiceTest("testWorkbenchServiceFactory")); + return ts; + } /** * @param testName */ diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java old mode 100755 new mode 100644 index 1b5fcbdc330..7af1b7ee727 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/services/ServicesTestSuite.java @@ -31,7 +31,7 @@ public final class ServicesTestSuite extends TestSuite { */ public ServicesTestSuite() { addTest(new TestSuite(EvaluationServiceTest.class)); - addTest(new TestSuite(ContributedServiceTest.class)); + addTest(ContributedServiceTest.suite()); addTest(new TestSuite(WorkbenchSiteProgressServiceTest.class)); addTest(new TestSuite(EditorSourceTest.class)); } -- cgit v1.2.3