diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/rules/WorkbenchContextRule.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/rules/WorkbenchContextRule.java index e3f0db61897..312ebef840c 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/rules/WorkbenchContextRule.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/rules/WorkbenchContextRule.java @@ -30,11 +30,12 @@ import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.e4.ui.workbench.swt.DisplayUISynchronize; import org.eclipse.swt.widgets.Display; -import org.junit.rules.MethodRule; -import org.junit.runners.model.FrameworkMethod; -import org.junit.runners.model.Statement; +import org.junit.jupiter.api.extension.AfterEachCallback; +import org.junit.jupiter.api.extension.BeforeEachCallback; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.TestInstancePostProcessor; -public class WorkbenchContextRule implements MethodRule { +public class WorkbenchContextRule implements BeforeEachCallback, AfterEachCallback, TestInstancePostProcessor { private IEclipseContext context; private E4Workbench wb; @@ -52,19 +53,18 @@ public void spinEventLoop() { } @Override - public Statement apply(final Statement base, final FrameworkMethod method, final Object target) { - return new Statement() { - @Override - public void evaluate() throws Throwable { - createContext(); - ContextInjectionFactory.inject(target, context); - try { - base.evaluate(); - } finally { - dispose(); - } - } - }; + public void beforeEach(ExtensionContext extensionContext) throws Exception { + createContext(); + } + + @Override + public void afterEach(ExtensionContext extensionContext) throws Exception { + dispose(); + } + + @Override + public void postProcessTestInstance(Object testInstance, ExtensionContext extensionContext) throws Exception { + ContextInjectionFactory.inject(testInstance, this.context); } protected void createContext() throws Throwable { diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/CompositePartClosingTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/CompositePartClosingTest.java index 4fe6342b056..0bcc684715d 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/CompositePartClosingTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/CompositePartClosingTest.java @@ -14,8 +14,8 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; @@ -28,13 +28,13 @@ import org.eclipse.e4.ui.tests.rules.WorkbenchContextRule; import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.e4.ui.workbench.modeling.EPartService; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; public class CompositePartClosingTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService ems; diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MMenuItemTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MMenuItemTest.java index 69d1216a37e..d2e9280ee12 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MMenuItemTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MMenuItemTest.java @@ -15,11 +15,11 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.inject.Inject; import jakarta.inject.Named; @@ -60,14 +60,14 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.Widget; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; public class MMenuItemTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService ems; @@ -78,7 +78,7 @@ public class MMenuItemTest { @Inject private MApplication application; - @Before + @BeforeEach public void setUp() { ContextInjectionFactory.make(CommandServiceAddon.class, appContext); ContextInjectionFactory.make(ContextServiceAddon.class, appContext); diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java index d137d5c92e0..014c9657387 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MPartTest.java @@ -15,10 +15,10 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import jakarta.inject.Inject; import org.eclipse.e4.core.contexts.IEclipseContext; @@ -32,13 +32,13 @@ import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; public class MPartTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private IEclipseContext appContext; diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MSaveablePartTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MSaveablePartTest.java index 0be806bb475..9909af51c56 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MSaveablePartTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MSaveablePartTest.java @@ -15,8 +15,8 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; @@ -28,13 +28,13 @@ import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.swt.custom.CTabFolder; import org.eclipse.swt.custom.CTabItem; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; public class MSaveablePartTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService ems; diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MToolItemTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MToolItemTest.java index 24d979d03d5..c27fa621098 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MToolItemTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MToolItemTest.java @@ -15,10 +15,10 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; @@ -33,13 +33,13 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.ToolItem; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; public class MToolItemTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService ems; diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java index bce03c4bbc0..4dd8ba41e31 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/MWindowTest.java @@ -15,14 +15,14 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import jakarta.inject.Inject; import org.eclipse.core.runtime.Platform; @@ -51,14 +51,14 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.tests.harness.util.DisplayHelper; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; public class MWindowTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private IEclipseContext appContext; @@ -250,7 +250,7 @@ public void testWindow_Name() { assertEquals("windowName2", shell.getText()); } - @Ignore + @Disabled @Test public void TODOtestWindow_X() { final MWindow window = ems.createModelElement(MWindow.class); @@ -283,7 +283,7 @@ public void TODOtestWindow_X() { assertEquals(300, bounds.x); } - @Ignore + @Disabled @Test public void TODOtestWindow_Y() { final MWindow window = ems.createModelElement(MWindow.class); diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/ModelServiceImplTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/ModelServiceImplTest.java index 79a13b354fe..0b369c76256 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/ModelServiceImplTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/ModelServiceImplTest.java @@ -14,7 +14,7 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -31,23 +31,23 @@ import org.eclipse.e4.ui.model.application.ui.basic.MWindow; import org.eclipse.e4.ui.tests.rules.WorkbenchContextRule; import org.eclipse.e4.ui.workbench.modeling.EModelService; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; public class ModelServiceImplTest { private static final String DUMMY_EDITOR_ID = "dummyEditor"; - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService modelService; private MPart editor; - @Before + @BeforeEach public void setUp() throws Exception { editor = modelService.createModelElement(MPart.class); editor.setElementId(DUMMY_EDITOR_ID); diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartOnTopManagerTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartOnTopManagerTest.java index c87dc55e9c5..9699d686064 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartOnTopManagerTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartOnTopManagerTest.java @@ -15,8 +15,8 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.inject.Inject; import org.eclipse.e4.ui.internal.workbench.PartOnTopManager; @@ -33,8 +33,8 @@ import org.eclipse.e4.ui.workbench.IWorkbench; import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.e4.ui.workbench.modeling.EPartService; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; /** * This test class is used to validate the correctness of the @@ -42,8 +42,8 @@ */ public class PartOnTopManagerTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService ems; diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java index a64873b5532..05408e6dd66 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java @@ -16,13 +16,13 @@ package org.eclipse.e4.ui.tests.workbench; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import jakarta.inject.Inject; import java.util.function.Consumer; @@ -66,11 +66,11 @@ import org.eclipse.swt.widgets.Widget; import org.eclipse.test.Screenshots; import org.eclipse.ui.tests.harness.util.DisplayHelper; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; import org.junit.rules.TestName; import org.junit.rules.TestWatcher; import org.osgi.service.log.LogLevel; @@ -79,8 +79,8 @@ public class PartRenderingEngineTests { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private IEclipseContext appContext; @@ -99,10 +99,10 @@ public class PartRenderingEngineTests { private boolean logged = false; private Consumer runtimeExceptionHandler; - @Rule + @RegisterExtension public TestName testName = new TestName(); - @Before + @BeforeEach public void setUp() { logged = false; @@ -110,7 +110,7 @@ public void setUp() { logReaderService.addLogListener(listener); } - @After + @AfterEach public void tearDown() throws Exception { LogReaderService logReaderService = appContext.get(LogReaderService.class); logReaderService.removeLogListener(listener); @@ -1961,7 +1961,7 @@ private void testBug326175(boolean visible) { } } - @Ignore + @Disabled @Test public void TODOtestBug326175_True() { testBug326175(true); @@ -2975,7 +2975,7 @@ public void testBug371100() { assertFalse(logged); } - @Rule + @RegisterExtension public TestWatcher screenshotRule = Screenshots.onFailure(null); @Test diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRendererTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRendererTest.java index 0493a340481..ece58a4313d 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRendererTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRendererTest.java @@ -14,9 +14,9 @@ package org.eclipse.e4.ui.workbench.renderers.swt; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.inject.Inject; import org.eclipse.e4.ui.model.application.MApplication; @@ -27,15 +27,15 @@ import org.eclipse.e4.ui.tests.rules.WorkbenchContextRule; import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.jface.action.MenuManager; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; public class MenuManagerRendererTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService ems; @@ -46,7 +46,7 @@ public class MenuManagerRendererTest { private MMenu menu; private MTrimmedWindow window; - @Before + @BeforeEach public void setUp() throws Exception { window = ems.createModelElement(MTrimmedWindow.class); application.getChildren().add(window); @@ -110,7 +110,7 @@ public void testMMenuItem_ToBeRendered() { } @Test - @Ignore("Bug 560200") + @Disabled("Bug 560200") public void testMMenu_ToBeRendered() { MMenu submenu1 = ems.createModelElement(MMenu.class); menu.getChildren().add(submenu1); diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java index 28c54cf74a7..7a7909b647f 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/StackRendererTest.java @@ -16,13 +16,13 @@ package org.eclipse.e4.ui.workbench.renderers.swt; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.inject.Inject; import java.lang.reflect.InvocationHandler; @@ -57,17 +57,17 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Widget; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; public class StackRendererTest { private static final String PART_DESC_ICON = "platform:/plugin/org.eclipse.e4.ui.tests/icons/pinned_ovr.svg"; private static final String PART_ICON = "platform:/plugin/org.eclipse.e4.ui.tests/icons/filenav_nav.svg"; - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private IEclipseContext context; @@ -81,7 +81,7 @@ public class StackRendererTest { private MWindow window; private MPartStack partStack; - @Before + @BeforeEach public void setUp() throws Exception { window = ems.createModelElement(MWindow.class); application.getChildren().add(window); diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRendererTest.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRendererTest.java index 364146896b5..23052639a67 100644 --- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRendererTest.java +++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRendererTest.java @@ -14,11 +14,11 @@ package org.eclipse.e4.ui.workbench.renderers.swt; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import jakarta.inject.Inject; import java.util.ArrayList; @@ -42,15 +42,15 @@ import org.eclipse.jface.action.ActionContributionItem; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.swt.SWTException; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.RegisterExtension; +import org.junit.jupiter.api.Test; import org.osgi.service.event.EventHandler; public class ToolBarManagerRendererTest { - @Rule - public WorkbenchContextRule contextRule = new WorkbenchContextRule(); + @RegisterExtension + WorkbenchContextRule contextRule = new WorkbenchContextRule(); @Inject private EModelService ems; @@ -65,7 +65,7 @@ public class ToolBarManagerRendererTest { private MToolBar toolBar; private MTrimmedWindow window; - @Before + @BeforeEach public void setUp() throws Exception { window = ems.createModelElement(MTrimmedWindow.class); application.getChildren().add(window);