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 9fa50cf241f..caaf856a567 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 @@ -29,10 +29,12 @@ import org.eclipse.ui.menus.IContributionRoot; import org.eclipse.ui.menus.IMenuService; import org.eclipse.ui.services.IServiceLocator; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; import org.eclipse.ui.tests.harness.util.UITestCase; import org.junit.After; import org.junit.Before; import org.junit.Ignore; +import org.junit.Rule; import org.junit.Test; public class MenusTest { @@ -42,6 +44,9 @@ public class MenusTest { private IMenuService service; private Set enabledActivities; + @Rule + public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); + /** * @since 3.3 */ diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/PartContextTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/PartContextTest.java index f95e47e9621..37c32ce7304 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/PartContextTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/PartContextTest.java @@ -31,8 +31,10 @@ import org.eclipse.ui.contexts.IContextService; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.tests.api.MockViewPart; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; import org.eclipse.ui.tests.harness.util.FileUtil; import org.eclipse.ui.tests.harness.util.UITestCase; +import org.junit.Rule; import org.junit.Test; /** @@ -48,6 +50,9 @@ public class PartContextTest { public static final String WINDOW_CONTEXT_ID = "org.eclipse.ui.tests.contexts.WorkbenchWindow"; + @Rule + public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); + @Test public void testBasicContextActivation() throws Exception { IContextService globalService = getWorkbench() diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/stress/OpenCloseTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/stress/OpenCloseTest.java index f9c7cd40acb..f02f18bb09b 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/stress/OpenCloseTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/stress/OpenCloseTest.java @@ -40,8 +40,10 @@ import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.intro.IIntroPart; import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; import org.eclipse.ui.tests.harness.util.FileUtil; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; /** @@ -56,6 +58,8 @@ public class OpenCloseTest { private IWorkbench workbench; private IWorkbenchPage page; + @Rule + public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); @Before public void setup() {