Migration of org.eclipse.e4.ui.bindings.tests to JUnit5

vogella · vogella · commit c3b375a93624 · 2025-06-08T15:50:43.000+02:00
Changes the suite, the dependencies and the test files to Jupiter API
diff --git a/tests/org.eclipse.e4.ui.bindings.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.bindings.tests/META-INF/MANIFEST.MF
@@ -8,9 +8,10 @@ Import-Package: org.eclipse.e4.core.commands,
  org.eclipse.e4.ui.services,
  org.eclipse.jface.bindings,
  org.eclipse.jface.bindings.keys,
+ org.junit.jupiter.api;version="[5.12.0,6.0.0)",
+ org.junit.platform.suite.api;version="[1.12.0,2.0.0)",
  org.osgi.framework;version="1.5.0"
 Require-Bundle: org.eclipse.core.commands;bundle-version="3.12.400",
- org.junit,
  org.eclipse.e4.ui.bindings;bundle-version="0.14.600",
  org.eclipse.swt;bundle-version="3.130.0",
  org.eclipse.e4.core.contexts,
diff --git a/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingCreateTest.java b/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingCreateTest.java
@@ -14,9 +14,10 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.bindings.tests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -31,9 +32,6 @@
 import org.eclipse.e4.ui.services.ContextServiceAddon;
 import org.eclipse.jface.bindings.Binding;
 import org.eclipse.jface.bindings.TriggerSequence;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
 
 @SuppressWarnings("restriction")
 public class BindingCreateTest {
@@ -48,7 +46,7 @@ public class BindingCreateTest {
 	private TriggerSequence seq, emptySeq;
 	private Map<String,String> emptyAttrs, schemeOnly, schemeAndTypeAttrs;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		IEclipseContext globalContext = TestUtil.getGlobalContext();
 		workbenchContext = globalContext.createChild("workbenchContext");
@@ -78,7 +76,7 @@ public void setupTestVars() {
 		schemeAndTypeAttrs.put(EBindingService.TYPE_ATTR_TAG, "user");
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		workbenchContext.dispose();
 		workbenchContext = null;
diff --git a/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingLookupTest.java b/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingLookupTest.java
@@ -14,11 +14,7 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.bindings.tests;
 
-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.*;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -42,9 +38,9 @@
 import org.eclipse.e4.ui.services.EContextService;
 import org.eclipse.jface.bindings.Binding;
 import org.eclipse.jface.bindings.TriggerSequence;
-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;
 
 @SuppressWarnings("restriction")
 public class BindingLookupTest {
@@ -74,7 +70,7 @@ private void defineCommands(IEclipseContext context) {
 		cs.defineCommand(TEST_ID2, "ID2", null, category, null);
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		IEclipseContext globalContext = TestUtil.getGlobalContext();
 		workbenchContext = globalContext.createChild("workbenchContext");
@@ -107,7 +103,7 @@ private void defineBindingTables(IEclipseContext context) {
 		btm.addTable(new BindingTable(cm.getContext(ID_DIALOG), application));
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		workbenchContext.dispose();
 		workbenchContext = null;
diff --git a/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingTableTests.java b/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingTableTests.java
@@ -15,11 +15,11 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.bindings.tests;
 
-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.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.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -41,8 +41,8 @@
 import org.eclipse.jface.bindings.Binding;
 import org.eclipse.jface.bindings.keys.KeyBinding;
 import org.eclipse.jface.bindings.keys.KeySequence;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("restriction")
 public class BindingTableTests {
@@ -93,7 +93,7 @@ public class BindingTableTests {
 	static IEclipseContext workbenchContext;
 	private MApplication application;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		IEclipseContext globalContext = TestUtil.getGlobalContext();
 		workbenchContext = globalContext.createChild("workbenchContext");
@@ -389,7 +389,7 @@ private Binding getTestBinding(String commandId) {
 
 	private void assertContextSet(ContextSet set, String[] contextIds) {
 		List<Context> contexts = set.getContexts();
-		assertEquals(contexts.toString(), contextIds.length, contexts.size());
+		assertEquals(contextIds.length, contexts.size(), contexts.toString());
 		for (int i = 0; i < contextIds.length; i++) {
 			assertEquals(contextIds[i], contexts.get(i).getId());
 		}
diff --git a/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingTestSuite.java b/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingTestSuite.java
@@ -14,16 +14,15 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.bindings.tests;
 
-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({
+@Suite
+@SelectClasses({
 	BindingLookupTest.class,
 	KeyDispatcherTest.class,
 	BindingTableTests.class,
 	BindingCreateTest.class,
 	KeyAssistDialogTest.class })
-
 public class BindingTestSuite {
 }
diff --git a/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/KeyAssistDialogTest.java b/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/KeyAssistDialogTest.java
@@ -13,8 +13,8 @@
 *******************************************************************************/
 package org.eclipse.e4.ui.bindings.tests;
 
-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 static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -27,7 +27,7 @@
 import org.eclipse.e4.ui.bindings.keys.KeyBindingDispatcher;
 import org.eclipse.jface.bindings.Binding;
 import org.eclipse.jface.bindings.keys.KeySequence;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("restriction")
 public class KeyAssistDialogTest {
diff --git a/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/KeyDispatcherTest.java b/tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/KeyDispatcherTest.java
@@ -15,9 +15,11 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.bindings.tests;
 
-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.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -50,10 +52,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
 
 @SuppressWarnings("restriction")
 public class KeyDispatcherTest {
@@ -129,7 +127,7 @@ private Binding createDefaultBinding(EBindingService bs,
 		return bs.createBinding(sequence, command, ID_WINDOW, attrs);
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		display = Display.getDefault();
 		IEclipseContext globalContext = TestUtil.getGlobalContext();
@@ -169,7 +167,7 @@ private void defineBindingTables(IEclipseContext context) {
 		btm.addTable(new BindingTable(cm.getContext(ID_DIALOG), application));
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		workbenchContext.dispose();
 		workbenchContext = null;
@@ -236,7 +234,7 @@ public void testExecuteMultiStrokeBinding() {
 	}
 
 	@Test
-	@Ignore
+	@Disabled
 	public void TODOtestKeyDispatcherReset() throws Exception {
 		assertFalse(twoStrokeHandler.q2);
 
