From bf2a112931d9ae33c50488dd781a590fbb5772a5 Mon Sep 17 00:00:00 2001 From: Lars Vogel Date: Tue, 23 Dec 2025 20:22:54 +0100 Subject: [PATCH] Migrate 5 tests to JUnit 5 using CloseTestWindowsExtension Migrated the following tests from JUnit 4 (CloseTestWindowsRule) to JUnit 5 (CloseTestWindowsExtension): - Bug264804Test.java - Bug231304Test.java - ShowViewMenuTest.java - Bug410426Test.java - MenuVisibilityTest.java Replaced @Rule CloseTestWindowsRule with @ExtendWith(CloseTestWindowsExtension.class) and updated JUnit annotations. --- .../eclipse/ui/tests/menus/Bug231304Test.java | 10 ++++------ .../eclipse/ui/tests/menus/Bug264804Test.java | 10 ++++------ .../eclipse/ui/tests/menus/Bug410426Test.java | 10 ++++------ .../ui/tests/menus/MenuVisibilityTest.java | 18 ++++++++---------- .../ui/tests/menus/ShowViewMenuTest.java | 14 ++++++-------- 5 files changed, 26 insertions(+), 36 deletions(-) diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug231304Test.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug231304Test.java index a557709a2bf..96eed4b4ca7 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug231304Test.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug231304Test.java @@ -24,20 +24,18 @@ import org.eclipse.swt.widgets.ToolItem; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.menus.IMenuService; -import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; -import org.junit.Rule; -import org.junit.Test; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * * @since 3.5 * @author Prakash G.R. */ +@ExtendWith(CloseTestWindowsExtension.class) public class Bug231304Test { - @Rule - public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); - @Test public void testToolTip() throws Exception { IWorkbenchWindow window = openTestWindow(); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug264804Test.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug264804Test.java index 7e0ea6b5cd4..b49e74dc60a 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug264804Test.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug264804Test.java @@ -32,19 +32,17 @@ import org.eclipse.ui.internal.PopupMenuExtender; import org.eclipse.ui.tests.api.ListElement; import org.eclipse.ui.tests.api.ListView; -import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; -import org.junit.Rule; -import org.junit.Test; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * @since 3.5 * @author Prakash G.R. */ +@ExtendWith(CloseTestWindowsExtension.class) public class Bug264804Test { - @Rule - public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); - @Test public void testPopup() throws Exception { IWorkbenchWindow window = openTestWindow(); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug410426Test.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug410426Test.java index 10172216d6b..26428742ff9 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug410426Test.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug410426Test.java @@ -29,20 +29,18 @@ import org.eclipse.swt.widgets.ToolItem; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.menus.IMenuService; -import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; -import org.junit.Rule; -import org.junit.Test; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.osgi.service.log.LogListener; import org.osgi.service.log.LogService; /** * @author Maxime Porhel */ +@ExtendWith(CloseTestWindowsExtension.class) public class Bug410426Test { - @Rule - public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); - @Test public void testToolbarContributionFromFactoryVisibility() throws Exception { IWorkbenchWindow window = openTestWindow(); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuVisibilityTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuVisibilityTest.java index 36e3127e8a2..1f4f070c472 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuVisibilityTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuVisibilityTest.java @@ -58,24 +58,22 @@ import org.eclipse.ui.tests.TestPlugin; import org.eclipse.ui.tests.api.workbenchpart.MenuContributionHarness; import org.eclipse.ui.tests.commands.ActiveContextExpression; -import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * @since 3.3 */ +@ExtendWith(CloseTestWindowsExtension.class) public class MenuVisibilityTest { private static final String EXTENSION_ID = "org.eclipse.ui.tests.menusX1"; private static final String LOCATION = "menu:foo"; private static final String COMMAND_ID = "org.eclipse.ui.tests.commandEnabledVisibility"; - @Rule - public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); - private IContextService contextService; private IMenuService menuService; private IWorkbenchWindow window; @@ -417,7 +415,7 @@ public void createContributionItems(IServiceLocator menuService, IContributionRo parentMenuManager.dispose(); } - @Before + @BeforeEach public final void setUp() throws Exception { window = openTestWindow(); menuService = window.getService(IMenuService.class); @@ -431,7 +429,7 @@ public final void setUp() throws Exception { } } - @After + @AfterEach public final void tearDown() throws Exception { if (activeContext != null) { contextService.deactivateContext(activeContext); diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ShowViewMenuTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ShowViewMenuTest.java index e9f793d35b5..fb34e714129 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ShowViewMenuTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ShowViewMenuTest.java @@ -19,22 +19,20 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.internal.ShowViewMenu; -import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; /** * @since 3.5 */ +@ExtendWith(CloseTestWindowsExtension.class) public class ShowViewMenuTest { - @Rule - public final CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule(); - private IWorkbenchWindow workbenchWindow; - @Before + @BeforeEach public final void setUp() throws Exception { // open a workbench window with the empty perspective, since it defines // no show view shortcuts, it is suitable for the two single show view