Migrate SWT suites to JUnit 5

First towards being able to move unit tests to JUnit 5.

Author: akurtakov

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java

@@ -14,20 +14,12 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.test.TracingSuite;
-import org.eclipse.test.TracingSuite.TracingOptions;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(TracingSuite.class)
-@TracingOptions(stackDumpTimeoutSeconds = 60)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	Test_org_eclipse_swt_browser_Browser.class,
 })
 public class AllBrowserTests {
-
-public static void main(String[] args) {
-	JUnitCore.main(AllBrowserTests.class.getName());
-}
 }

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllGraphicsTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -13,15 +13,14 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Suite for testing all of the graphics test cases.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ Test_org_eclipse_swt_graphics_Color.class,
+@Suite
+@SelectClasses({ Test_org_eclipse_swt_graphics_Color.class,
 		Test_org_eclipse_swt_graphics_Cursor.class,
 		Test_org_eclipse_swt_graphics_DeviceData.class,
 		Test_org_eclipse_swt_graphics_Font.class,
@@ -41,7 +40,4 @@
 		Test_org_eclipse_swt_graphics_ImageLoaderEvent.class,
 		Test_org_eclipse_swt_graphics_Transform.class })
 public class AllGraphicsTests {
-	public static void main(String[] args) {
-		JUnitCore.main(AllGraphicsTests.class.getName());
-	}
 }

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2022 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -18,17 +18,16 @@
 import java.util.List;
 
 import org.eclipse.swt.graphics.Resource;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Suite for running most SWT test cases (all except for browser tests).
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ Test_org_eclipse_swt_SWT.class, Test_org_eclipse_swt_SWTException.class,
+@Suite
+@SelectClasses({ Test_org_eclipse_swt_SWT.class, Test_org_eclipse_swt_SWTException.class,
 		Test_org_eclipse_swt_SWTError.class, Test_org_eclipse_swt_widgets_Display.class, AllGraphicsTests.class,
 		AllWidgetTests.class, Test_org_eclipse_swt_layout_GridData.class,
 		Test_org_eclipse_swt_events_ControlEvent.class, Test_org_eclipse_swt_events_ModifyEvent.class,
@@ -50,7 +49,7 @@
 public class AllNonBrowserTests {
 	private static List<Error> leakedResources;
 
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		// Set up ResourceTracked to detect any leaks
 		leakedResources = new ArrayList<> ();
@@ -67,7 +66,7 @@ public static void beforeClass() {
 	 * through  a test and not through @AfterClass, but this is a
 	 * suite class and not a test class, so it can't have tests.
 	 */
-	@AfterClass
+	@AfterAll
 	public static void afterClass() {
 		// Run GC in order do detect any outstanding leaks
 		System.gc ();
@@ -93,10 +92,6 @@ public static void afterClass() {
 		}
 	}
 
-	public static void main(String[] args) {
-		JUnitCore.main(AllNonBrowserTests.class.getName());
-	}
-
 	/*
 	 * The logical order to run the tests in is: - SWT, SWTError, SWTException -
 	 * Display - graphics classes - items and Caret, etc - widgets - dialogs -

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -14,21 +14,17 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Suite for running all SWT test cases.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	AllNonBrowserTests.class,
 	AllBrowserTests.class
 })
 public class AllTests {
 
-public static void main(String[] args) {
-	JUnitCore.main(AllTests.class.getName());
-}
 }

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -14,15 +14,14 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import org.junit.runner.JUnitCore;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Suite for testing all of the widget test cases.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({ Test_org_eclipse_swt_widgets_Shell.class,
+@Suite
+@SelectClasses({ Test_org_eclipse_swt_widgets_Shell.class,
 		Test_org_eclipse_swt_widgets_ExpandItem.class, Test_org_eclipse_swt_widgets_MenuItem.class,
 		Test_org_eclipse_swt_widgets_ToolItem.class, Test_org_eclipse_swt_widgets_TabItem.class,
 		Test_org_eclipse_swt_widgets_TableItem.class, Test_org_eclipse_swt_widgets_TableColumn.class,
@@ -53,7 +52,4 @@
 		Test_org_eclipse_swt_widgets_ScrolledComposite.class,
 		Test_org_eclipse_swt_custom_BusyIndicator.class})
 public class AllWidgetTests {
-	public static void main(String[] args) {
-		JUnitCore.main(AllWidgetTests.class.getName());
-	}
 }

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/PerformanceTests.java

@@ -13,15 +13,14 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit.performance;
 
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
 /**
  * Suite for running SWT performance test cases.
  */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@Suite
+@SelectClasses({
 	Test_situational.class
 })
 public class PerformanceTests {

tests/org.eclipse.swt.tests/META-INF/MANIFEST.MF

@@ -6,7 +6,14 @@ Bundle-Version: 3.107.800.qualifier
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.swt.tests.junit,
  org.eclipse.swt.tests.junit.performance
-Require-Bundle: org.junit;bundle-version="4.12.0",
+Require-Bundle: org.junit;bundle-version="4.13.2",
+ junit-vintage-engine;bundle-version="5.12.0",
+ junit-jupiter-engine;bundle-version="5.12.0",
+ junit-jupiter-params;bundle-version="5.12.0",
+ junit-jupiter-api;bundle-version="5.12.0",
+ junit-platform-suite-api;bundle-version="1.12.0",
+ junit-platform-suite-commons;bundle-version="1.12.0",
+ junit-platform-suite-engine;bundle-version="1.12.0",
  org.eclipse.swt;bundle-version="3.120.0",
  org.eclipse.test;bundle-version="3.6.200",
  org.eclipse.test.performance;bundle-version="3.13.0"

tests/org.eclipse.swt.tests/pom.xml

@@ -60,13 +60,23 @@
             </configuration>
           </execution>
         </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit47</artifactId>
-            <version>${surefire.version}</version>
-          </dependency>
-        </dependencies>
+		<dependencies>
+			<dependency>
+				<groupId>org.apache.maven.surefire</groupId>
+				<artifactId>surefire-junit-platform</artifactId>
+				<version>${surefire.version}</version>
+			</dependency>
+			<dependency>
+			    <groupId>org.junit.vintage</groupId>
+			    <artifactId>junit-vintage-engine</artifactId>
+			    <version>5.12.0</version>
+			</dependency>
+			<dependency>
+			    <groupId>org.junit.platform</groupId>
+			    <artifactId>junit-platform-suite-engine</artifactId>
+			    <version>1.12.0</version>
+			</dependency>
+		</dependencies>
       </plugin>
     </plugins>
   </build>