Skip to content

Commit 24c36fe

Browse files
committed
Add CloseTestWindowsRule
To remaining tests identified. Fixes #2615
1 parent 61cca8f commit 24c36fe

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/activities/MenusTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
import org.eclipse.ui.menus.IContributionRoot;
3030
import org.eclipse.ui.menus.IMenuService;
3131
import org.eclipse.ui.services.IServiceLocator;
32+
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
3233
import org.eclipse.ui.tests.harness.util.UITestCase;
3334
import org.junit.After;
3435
import org.junit.Before;
3536
import org.junit.Ignore;
37+
import org.junit.Rule;
3638
import org.junit.Test;
3739

3840
public class MenusTest {
@@ -42,6 +44,9 @@ public class MenusTest {
4244
private IMenuService service;
4345
private Set<String> enabledActivities;
4446

47+
@Rule
48+
public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
49+
4550
/**
4651
* @since 3.3
4752
*/

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/contexts/PartContextTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
import org.eclipse.ui.contexts.IContextService;
3232
import org.eclipse.ui.part.FileEditorInput;
3333
import org.eclipse.ui.tests.api.MockViewPart;
34+
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
3435
import org.eclipse.ui.tests.harness.util.FileUtil;
3536
import org.eclipse.ui.tests.harness.util.UITestCase;
37+
import org.junit.Rule;
3638
import org.junit.Test;
3739

3840
/**
@@ -48,6 +50,9 @@ public class PartContextTest {
4850

4951
public static final String WINDOW_CONTEXT_ID = "org.eclipse.ui.tests.contexts.WorkbenchWindow";
5052

53+
@Rule
54+
public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
55+
5156
@Test
5257
public void testBasicContextActivation() throws Exception {
5358
IContextService globalService = getWorkbench()

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/stress/OpenCloseTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
import org.eclipse.ui.handlers.IHandlerService;
4141
import org.eclipse.ui.intro.IIntroPart;
4242
import org.eclipse.ui.part.FileEditorInput;
43+
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
4344
import org.eclipse.ui.tests.harness.util.FileUtil;
4445
import org.junit.Before;
46+
import org.junit.Rule;
4547
import org.junit.Test;
4648

4749
/**
@@ -56,6 +58,8 @@ public class OpenCloseTest {
5658
private IWorkbench workbench;
5759
private IWorkbenchPage page;
5860

61+
@Rule
62+
public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();
5963

6064
@Before
6165
public void setup() {

0 commit comments

Comments
 (0)