Skip to content

Migrate 5 tests to JUnit 5 using CloseTestWindowsExtension #3611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vogella merged 1 commit into from
Dec 23, 2025
+26 −36
Merged

Migrate 5 tests to JUnit 5 using CloseTestWindowsExtension #3611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug231304Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
10 changes: 4 additions & 6 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug264804Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
10 changes: 4 additions & 6 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/Bug410426Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
18 changes: 8 additions & 10 deletions .../org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuVisibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -431,7 +429,7 @@ public final void setUp() throws Exception {
}
}

@After
@AfterEach
public final void tearDown() throws Exception {
if (activeContext != null) {
contextService.deactivateContext(activeContext);
Expand Down
14 changes: 6 additions & 8 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/menus/ShowViewMenuTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading