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

WIP

Author: vogella

tests/org.eclipse.e4.ui.bindings.tests/META-INF/MANIFEST.MF

@@ -8,6 +8,9 @@ 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.jupiter.migrationsupport;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,

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());
 		}

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 {
 }