Skip to content

Migrate 10 tests to JUnit 5 using CloseTestWindowsExtension #3612

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

Open
vogella wants to merge 2 commits into
base: master
Choose a base branch
from
+154 −108
Open

Migrate 10 tests to JUnit 5 using CloseTestWindowsExtension #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501509d
Migrate 10 tests to JUnit 5 using CloseTestWindowsExtension
vogella Dec 28, 2025
11532d5
Migrate to PreferenceMementoExtension in PR 3612
vogella Dec 28, 2025
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
64 changes: 64 additions & 0 deletions ...se.ui.tests.harness/src/org/eclipse/ui/tests/harness/util/PreferenceMementoExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*******************************************************************************
* Copyright (c) 2025 Vector Informatik and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.ui.tests.harness.util;

import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceMemento;
import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;

/**
* Preference helper to restore changed preference values after test run.
*/
public class PreferenceMementoExtension implements BeforeEachCallback, AfterEachCallback {

private PreferenceMemento prefMemento;

@Override
public void beforeEach(ExtensionContext context) {
prefMemento = new PreferenceMemento();
}

@Override
public void afterEach(ExtensionContext context) {
if (prefMemento != null) {
prefMemento.resetPreferences();
}
}

/**
* Change a preference value for the associated test run. The preference will
* automatically be reset to the value it had before starting when executing
* {@link #afterEach(ExtensionContext)}.
*
* @param <T> preference value type. The type must have a corresponding
* {@link IPreferenceStore} setter.
* @param store preference store to manipulate (must not be <code>null</code>)
* @param name preference to change
* @param value new preference value
* @throws IllegalArgumentException when setting a type which is not supported
* by {@link IPreferenceStore}
*
* @see IPreferenceStore#setValue(String, double)
* @see IPreferenceStore#setValue(String, float)
* @see IPreferenceStore#setValue(String, int)
* @see IPreferenceStore#setValue(String, long)
* @see IPreferenceStore#setValue(String, boolean)
* @see IPreferenceStore#setValue(String, String)
*/
public <T> void setPreference(IPreferenceStore store, String name, T value) {
if (prefMemento == null) {
prefMemento = new PreferenceMemento();
}
prefMemento.setValue(store, name, value);
}
}
14 changes: 6 additions & 8 deletions ...eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/ActionExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,17 @@
import org.eclipse.ui.IWorkbenchWindow;
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.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;

/**
* This class contains tests for popup menu enablement
*/
@ExtendWith(CloseTestWindowsExtension.class)
public abstract class ActionExpressionTest {

@Rule
public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();

protected IWorkbenchWindow fWindow;

protected IWorkbenchPage fPage;
Expand All @@ -47,7 +45,7 @@ public abstract class ActionExpressionTest {

ListElement redTrue = new ListElement("red", true);

@Before
@BeforeEach
public final void setUp() throws Exception {
fWindow = openTestWindow();
fPage = fWindow.getActivePage();
Expand Down
24 changes: 11 additions & 13 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/Bug41931Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.eclipse.ui.tests.internal;

import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
Expand All @@ -30,22 +30,20 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.internal.WorkbenchPage;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

/**
* Test for Bug 41931.
*
* @since 3.0
*/
@Ignore
@Disabled
@ExtendWith(CloseTestWindowsExtension.class)
public class Bug41931Test {

@Rule
public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();

/**
* Tests that the <code>bringToTop(IWorkbenchPart)</code> correctly
* updates the activation list.
Expand Down Expand Up @@ -83,8 +81,8 @@ public void testBringToTop() throws CoreException {
IEditorPart[] expectedResults = { editorA, editorB, editorC };
IWorkbenchPartReference[] actualResults = page.getSortedParts();
for (int i = 0; i < expectedResults.length; i++) {
assertEquals(
"Pre-test order is not correct.", expectedResults[i].getTitle(), actualResults[i].getPart(false).getTitle()); //$NON-NLS-1$
assertEquals(expectedResults[i].getTitle(), actualResults[i].getPart(false).getTitle(),
"Pre-test order is not correct."); //$NON-NLS-1$
}

// Bring editor B to the top.
Expand All @@ -94,8 +92,8 @@ public void testBringToTop() throws CoreException {
expectedResults = new IEditorPart[] { editorA, editorC, editorB };
actualResults = page.getSortedParts();
for (int i = 0; i < expectedResults.length; i++) {
assertEquals(
"bringToTop() does not change sorted part order.", expectedResults[i].getTitle(), actualResults[i].getPart(false).getTitle()); //$NON-NLS-1$
assertEquals(expectedResults[i].getTitle(), actualResults[i].getPart(false).getTitle(),
"bringToTop() does not change sorted part order."); //$NON-NLS-1$
}
}
}
23 changes: 11 additions & 12 deletions ...ipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/PerspectiveSwitcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
package org.eclipse.ui.tests.internal;

import static org.eclipse.ui.PlatformUI.getWorkbench;
import static org.junit.Assert.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import org.eclipse.e4.ui.workbench.modeling.EModelService;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.internal.WorkbenchWindow;
import org.eclipse.ui.internal.util.PrefUtil;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
import org.eclipse.ui.tests.harness.util.PreferenceMementoRule;
import org.junit.Rule;
import org.junit.Test;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
import org.eclipse.ui.tests.harness.util.PreferenceMementoExtension;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;

@ExtendWith(CloseTestWindowsExtension.class)
public class PerspectiveSwitcherTest {

@Rule
public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();

@Rule
public final PreferenceMementoRule preferenceMemento = new PreferenceMementoRule();
@RegisterExtension
public final PreferenceMementoExtension preferenceMemento = new PreferenceMementoExtension();

/**
* This test ensures that our workbench window's perspective bar can opened if
Expand All @@ -44,14 +43,14 @@ public void testCreatePerspectiveSwithcerInToolbar() {
IPreferenceStore apiPreferenceStore = PrefUtil.getAPIPreferenceStore();

WorkbenchWindow window = (WorkbenchWindow) getWorkbench().getActiveWorkbenchWindow();
assertNotNull("We should have a perspective bar in the beginning", getPerspectiveSwitcher(window)); //$NON-NLS-1$
assertNotNull(getPerspectiveSwitcher(window), "We should have a perspective bar in the beginning"); //$NON-NLS-1$

// turn off the 'Open Perspective' item
preferenceMemento.setPreference(apiPreferenceStore, IWorkbenchPreferenceConstants.SHOW_OPEN_ON_PERSPECTIVE_BAR,
false);

// check that we still have a perspective bar
assertNotNull("The perspective bar should have been created successfully", getPerspectiveSwitcher(window)); //$NON-NLS-1$
assertNotNull(getPerspectiveSwitcher(window), "The perspective bar should have been created successfully"); //$NON-NLS-1$

}

Expand Down
29 changes: 14 additions & 15 deletions ...clipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/StickyViewManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package org.eclipse.ui.tests.internal;

import static org.eclipse.ui.PlatformUI.getWorkbench;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;

import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveDescriptor;
Expand All @@ -26,27 +26,26 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
import org.eclipse.ui.tests.harness.util.PreferenceMementoRule;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
import org.eclipse.ui.tests.harness.util.PreferenceMementoExtension;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.RegisterExtension;

/**
* @since 3.6
*/
@Ignore
@Disabled
@ExtendWith(CloseTestWindowsExtension.class)
public class StickyViewManagerTest {

@Rule
public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();
@RegisterExtension
public final PreferenceMementoExtension preferenceMemento = new PreferenceMementoExtension();

@Rule
public final PreferenceMementoRule preferenceMemento = new PreferenceMementoRule();


@Before
@BeforeEach
public final void setUp() throws Exception {
preferenceMemento.setPreference(PlatformUI.getPreferenceStore(),
IWorkbenchPreferenceConstants.ENABLE_32_STICKY_CLOSE_BEHAVIOR, false);
Expand Down
18 changes: 8 additions & 10 deletions .../org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/internal/TextHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
import static org.eclipse.ui.tests.harness.util.UITestUtil.processEvents;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeFalse;

import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.dnd.Clipboard;
Expand All @@ -27,23 +27,21 @@
import org.eclipse.swt.dnd.URLTransfer;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.TextActionHandler;
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;

/**
* Test for {@link TextActionHandler}.
*
* @since 3.5
*/
@ExtendWith(CloseTestWindowsExtension.class)
public class TextHandlerTest {

@Rule
public final CloseTestWindowsRule closeTestWindowsRule = new CloseTestWindowsRule();

@Test
public void testEditableText() throws Exception {
assumeFalse("Test fails on Mac: Bug 544675", Platform.OS_MACOSX.equals(Platform.getOS()));
assumeFalse(Platform.OS_MACOSX.equals(Platform.getOS()), "Test fails on Mac: Bug 544675");

IWorkbenchWindow window = openTestWindow();
TextControlView view = (TextControlView) window.getActivePage()
Expand Down
16 changes: 7 additions & 9 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug36537Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.eclipse.ui.tests.keys;

import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
import static org.junit.Assert.assertFalse;
import static org.junit.jupiter.api.Assertions.assertFalse;

import java.util.ArrayList;
import java.util.HashMap;
Expand All @@ -29,20 +29,18 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.keys.IBindingService;
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;

/**
* Tests Bug 36537
*
* @since 3.0
*/
@ExtendWith(CloseTestWindowsExtension.class)
public class Bug36537Test {

@Rule
public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();

/**
* Tests that there are no redundant key bindings defined in the
* application.
Expand Down Expand Up @@ -115,8 +113,8 @@ public void testForRedundantKeySequenceBindings() {
nullMatches++;
}

assertFalse(
"Redundant key bindings: " + binding + ", " + matchedBinding, same && (nullMatches < 1)); //$NON-NLS-1$ //$NON-NLS-2$
assertFalse(same && (nullMatches < 1),
"Redundant key bindings: " + binding + ", " + matchedBinding); //$NON-NLS-1$ //$NON-NLS-2$
}

// Add the key binding.
Expand Down
20 changes: 9 additions & 11 deletions tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug40023Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package org.eclipse.ui.tests.keys;

import static org.eclipse.ui.tests.harness.util.UITestUtil.openTestWindow;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.FileNotFoundException;
import java.io.IOException;
Expand All @@ -33,22 +33,20 @@
import org.eclipse.ui.internal.Workbench;
import org.eclipse.ui.internal.keys.BindingService;
import org.eclipse.ui.keys.IBindingService;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.eclipse.ui.tests.harness.util.CloseTestWindowsExtension;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

/**
* Tests Bug 40023
*
* @since 3.0
*/
@Ignore("Intermittent failure. SWT Bug 44344. XGrabPointer?")
@Disabled("Intermittent failure. SWT Bug 44344. XGrabPointer?")
@ExtendWith(CloseTestWindowsExtension.class)
public class Bug40023Test {

@Rule
public CloseTestWindowsRule closeTestWindows = new CloseTestWindowsRule();

/**
* Retrieves a menu item matching or starting with the given name from an
* array of menu items.
Expand Down Expand Up @@ -112,7 +110,7 @@ public void testCheckOnCheckbox() throws CoreException, CommandException,
"&Window"); //$NON-NLS-1$
MenuItem lockToolBarsMenuItem = getMenuItem(windowMenu.getMenu()
.getItems(), "Lock the &Toolbars"); //$NON-NLS-1$
assertTrue("Checkbox menu item is not checked.", lockToolBarsMenuItem //$NON-NLS-1$
.getSelection());
assertTrue(lockToolBarsMenuItem //$NON-NLS-1$
.getSelection(), "Checkbox menu item is not checked.");
}
}
Loading
Loading