Convert o.e.swt.tests.gtk to JUnit 5

Author: akurtakov

tests/org.eclipse.swt.tests.gtk/JUnit Tests/org/eclipse/swt/tests/gtk/AllGTKTests.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Red Hat and others. All rights reserved.
+ * Copyright (c) 2018, 2025 Red Hat and others. All rights reserved.
  * The contents of this file are made available under the terms
  * of the GNU Lesser General Public License (LGPL) Version 2.1 that
  * accompanies this distribution (lgpl-v21.txt).  The LGPL is also
@@ -14,21 +14,14 @@
  */
 package org.eclipse.swt.tests.gtk;
 
-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(Suite.class)
-@Suite.SuiteClasses({
-		// Test.class be added here.
+@Suite
+@SelectClasses({
 	Test_GtkConverter.class
 })
 
 public class AllGTKTests {
 
-	public static void main(String[] args) {
-		JUnitCore.main(AllGTKTests.class.getName()); // Enable once a test is added.
-	}
-
 }

tests/org.eclipse.swt.tests.gtk/JUnit Tests/org/eclipse/swt/tests/gtk/Test_GtkConverter.java

@@ -14,13 +14,13 @@
  */
 package org.eclipse.swt.tests.gtk;
 
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.nio.charset.StandardCharsets;
 
 import org.eclipse.swt.internal.Converter;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  *  Good source for UTF-8 code points for testing:
@@ -144,7 +144,7 @@ public void test_HeuristicUTF16_LotsOfLetters() {
 	 * This test is documented, but is currently known to fail.
 	 *
 	 */
-	@Ignore
+	@Disabled
 	@Test
 	public void test_Heuristic_specialSingleCases() {
 		byte [] testBytes = "Ё".getBytes(StandardCharsets.UTF_16LE);

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

@@ -4,8 +4,9 @@ Bundle-Name: Eclipse SWT Tests Linux/gtk
 Bundle-SymbolicName: org.eclipse.swt.tests.gtk
 Bundle-Version: 3.109.100.qualifier
 Bundle-Vendor: Eclipse.org
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.swt
+Require-Bundle: junit-jupiter-api,
+ org.eclipse.swt,
+ junit-platform-suite-api
 Eclipse-BundleShape: dir
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.swt.tests.gtk

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug336238_ShellSetBoundFailTest.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Red Hat and others.
+ * Copyright (c) 2018, 2025 Red Hat and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -13,10 +13,11 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.gtk.snippets;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.swt.widgets.Shell;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class Bug336238_ShellSetBoundFailTest {
 

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/gtk/snippets/Bug497705_setBoundsAfterSetVisible.java

@@ -14,7 +14,8 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.gtk.snippets;
 
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -26,9 +27,9 @@
 import org.eclipse.swt.widgets.Control;
 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;
 
 
 /**
@@ -55,7 +56,7 @@ public class Bug497705_setBoundsAfterSetVisible {
 	private Rectangle bounds;
 	Control testControl;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		display = Display.getDefault();
 		shell = new Shell(display);
@@ -183,7 +184,7 @@ public void works_drainingQueue() {
 		verifyBounds();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		if (debugShowWidget) {
 			if (!passed) System.err.println(log.toString());
@@ -195,7 +196,7 @@ public void tearDown() {
 			}
 			display.dispose();
 		}
-		assertTrue(log.toString(), passed);
+		assertTrue(passed, log.toString());
 	}
 
 	private void verifyBounds() {

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/manualJUnit/MJ_Table.java

@@ -57,11 +57,11 @@
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)  // To make it easier for human to go through the tests. Same order makes tests easier to recognize.
+@TestMethodOrder(MethodOrderer.MethodName.class)  // To make it easier for human to go through the tests. Same order makes tests easier to recognize.
 public class MJ_Table extends MJ_root {
 
 	// Shared elements:
@@ -112,7 +112,7 @@ public class MJ_Table extends MJ_root {
 	 */
 	@Test
 	public void ownerDrawn_cheese_single_col () {
-		knownToBeBrokenGtk3("Cheese on gtk3"); // z for warning
+//		knownToBeBrokenGtk3("Cheese on gtk3"); // z for warning
 		Shell shell = mkShell("Expected: There should be no cheese in the items. Move over shouldn't cheese out. See javadoc for screenshot");
 		shell.setLayout(new FillLayout(SWT.VERTICAL));
 

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/manualJUnit/MJ_Template.java

@@ -17,12 +17,12 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
 /** Convenience class for easy copy & paste */
-@FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.MethodName.class)
 public class MJ_Template extends MJ_root {
 
 	@Test

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/manualJUnit/MJ_Tree.java

@@ -32,12 +32,12 @@
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.swt.widgets.TreeItem;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
 
 /** Convenience class for easy copy & paste */
-@FixMethodOrder(MethodSorters.JVM)
+@TestMethodOrder(MethodOrderer.MethodName.class)
 public class MJ_Tree extends MJ_root {
 
 

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/manualJUnit/MJ_curr_working_set.java

@@ -14,13 +14,13 @@
  */
 package org.eclipse.swt.tests.manualJUnit;
 
-import org.junit.FixMethodOrder;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.TestMethodOrder;
 
 /**
  * During development/testing, sometimes when you want to run specific set of jUnits, you can move them here temporarily.
  */
-@FixMethodOrder(MethodSorters.JVM)  // To make it easier for human to go through the tests. Same order makes tests easier to recognize.
+@TestMethodOrder(MethodOrderer.MethodName.class)  // To make it easier for human to go through the tests. Same order makes tests easier to recognize.
 public class MJ_curr_working_set extends MJ_root {
 
 

tests/org.eclipse.swt.tests.gtk/ManualTests/org/eclipse/swt/tests/manualJUnit/MJ_root.java

@@ -16,17 +16,16 @@
 
 package org.eclipse.swt.tests.manualJUnit;
 
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
 
 /**
  * Some tests can't be automated and have to be tested manually by visual inspection.
@@ -52,15 +51,16 @@ public class MJ_root {
 	/** Default Shell values */
 	final int SWIDTH = 1200;
 	final int SHEIGHT = 800;
-
+	private TestInfo testInfo;
 	Display display;
-	@Before //each test.
-	public void setUp() {
+	@BeforeEach //each test.
+	public void setUp(TestInfo testInfo) {
 		display = new Display();
 		display.addFilter(SWT.KeyDown, globalTestValidatorViaKeyboard);
+		this.testInfo = testInfo;
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		if (!display.isDisposed()) { // pass = shell is disposed.
 			display.dispose();
@@ -102,10 +102,8 @@ void mainLoop(Shell shell) {
 		}
 	};
 
-	@Rule
-	public TestName testName = new TestName();
 	private String getCurrentTestName() {
-		return testName.getMethodName ();
+		return testInfo.getDisplayName();
 	}