[E4] Migrate o.e.e4.ui.w.addons.swt.test to JUnit5

Migration of test bundle org.eclipse.e4.ui.workbench.addons.swt.test from JUnit4 to JUnit5.

Author: p-O-q

tests/org.eclipse.e4.ui.workbench.addons.swt.test/META-INF/MANIFEST.MF

@@ -2,15 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.ui.workbench.addons.swt.test
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.100.qualifier
 Bundle-Localization: plugin
 Fragment-Host: org.eclipse.e4.ui.workbench.addons.swt;bundle-version="[1.1.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.e4.core.commands;bundle-version="[1.0.0,2.0.0)",
+Require-Bundle: org.eclipse.e4.core.commands;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.6.200,2.0.0)",
- org.eclipse.e4.ui.workbench.swt;bundle-version="[0.12.100,1.0.0)"
+ org.eclipse.e4.ui.workbench.swt;bundle-version="[0.12.100,1.0.0)",
+ org.mockito.mockito-core;bundle-version="5.15.2",
+ junit-jupiter-params;bundle-version="5.11.4",
+ junit-jupiter-api;bundle-version="5.11.4",
+ junit-platform-suite-api;bundle-version="1.11.4"
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.e4.ui.workbench.addons.minmax;x-internal:=true
 Automatic-Module-Name: org.eclipse.e4.ui.workbench.addons.swt.test

tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/AllTests.java

@@ -4,12 +4,11 @@
 import org.eclipse.e4.ui.workbench.addons.minmax.MaximizableChildrenTag;
 import org.eclipse.e4.ui.workbench.addons.minmax.MaximizeBugTest;
 import org.eclipse.e4.ui.workbench.addons.minmax.MaximizePartSashContainerPlaceholderTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@SuiteClasses({ //
+@Suite
+@SelectClasses({ //
 		MaximizeBugTest.class, //
 		MaximizePartSashContainerPlaceholderTest.class, //
 		MaximizableChildrenTag.class, //

tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddonTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Vector Informatik GmbH and others.
+ * Copyright (c) 2024, 2025 Vector Informatik GmbH and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -10,16 +10,15 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.workbench.addons.cleanupaddon;
 
-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 java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
 import java.util.function.Supplier;
 
-import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.ui.di.UISynchronize;
@@ -56,9 +55,11 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 
 public class CleanupAddonTest {
 	private static final Duration TIMEOUT = Duration.ofSeconds(30);
@@ -74,12 +75,12 @@ public class CleanupAddonTest {
 	private MTrimmedWindow window;
 	private IEclipseContext appContext;
 
-	@Before
+	@BeforeEach
 	public void before() {
 		prepareApplicationModel();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		renderer.removeGui(window);
 		renderer.stop();
@@ -188,12 +189,10 @@ public Image adornImage(Image toAdorn, Image adornment) {
 		shell = (Shell) renderer.createGui(window);
 	}
 
+	@DisabledOnOs(value = { OS.MAC }, //
+			disabledReason = "not working reliably on Mac, see https://github.com/eclipse-platform/eclipse.platform.ui/issues/1784")
 	@Test
 	public void testRemovingPrimaryDataStackTransfersToRemainingStack() {
-		assumeFalse(
-				"not working reliably on Mac, see https://github.com/eclipse-platform/eclipse.platform.ui/issues/1784",
-				OS.isMac());
-
 		PartStackUtil.initializeAsPrimaryDataStack(partStack1);
 		assertTrue(PartStackUtil.isPrimaryDataStack(partStack1));
 		assertFalse(PartStackUtil.isPrimaryDataStack(partStack2));
@@ -218,5 +217,4 @@ private static void waitForCondition(Supplier<Boolean> condition, Duration timeo
 			Display.getCurrent().readAndDispatch();
 		}
 	}
-
 }

tests/org.eclipse.e4.ui.workbench.addons.swt.test/src/org/eclipse/e4/ui/workbench/addons/minmax/MaximizableChildrenTag.java

@@ -1,7 +1,7 @@
 package org.eclipse.e4.ui.workbench.addons.minmax;
 
-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 java.net.MalformedURLException;
 import java.net.URL;
@@ -41,9 +41,9 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MaximizableChildrenTag {
 
@@ -57,12 +57,12 @@ public class MaximizableChildrenTag {
 	private MTrimmedWindow window;
 	private IEclipseContext appContext;
 
-	@Before
+	@BeforeEach
 	public void before() {
 		prepareApplicationModel();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		renderer.removeGui(window);
 		renderer.stop();