Migrate org.eclipse.e4.core.tests to JUnit 5 (javax + jakarta variant)

- Add ContextPerformanceTest to test suite
- Remove location markers

Author: ptziegler

runtime/tests/org.eclipse.e4.core.javax.tests/META-INF/MANIFEST.MF

@@ -17,13 +17,12 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: javax.annotation;version="[1.3.0,2.0.0)",
  javax.inject;version="[1.0.0,2.0.0)",
- junit.framework;version="[4.13.0,5.0.0)",
  org.assertj.core.api,
  org.eclipse.osgi.service.datalocation,
  org.eclipse.osgi.service.debug,
- org.junit;version="[4.13.0,5.0.0)",
- org.junit.runner;version="[4.13.0,5.0.0)",
- org.junit.runners;version="[4.13.0,5.0.0)",
+ org.junit.jupiter.api;version="[5.12.0,6.0.0)",
+ org.junit.jupiter.api.function;version="[5.12.0,6.0.0)",
+ org.junit.platform.suite.api;version="[1.12.0,2.0.0)",
  org.osgi.framework;version="[1.10.0,2.0.0)",
  org.osgi.service.component;version="1.3.0",
  org.osgi.service.component.propertytypes;version="[1.4.0,2.0.0)",

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/ActivationTest.java

@@ -15,8 +15,8 @@
 
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -25,7 +25,7 @@
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.contexts.RunAndTrack;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ActivationTest {
 

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/ContextDynamicTest.java

@@ -14,15 +14,15 @@
  *******************************************************************************/
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.internal.tests.contexts.inject.ObjectBasic;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for the basic context functionality

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/DependenciesLeakTest.java

@@ -14,15 +14,15 @@
  *******************************************************************************/
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.internal.contexts.EclipseContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("restriction")
 public class DependenciesLeakTest {
@@ -48,7 +48,7 @@ public String toString() {
 	private IEclipseContext perspectiveContext;
 	private IEclipseContext partContext;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		windowContext = EclipseContextFactory.create("Window");
 		perspectiveContext = windowContext.createChild("Perspective");

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/EclipseContextTest.java

@@ -14,19 +14,19 @@
  *******************************************************************************/
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.contexts.RunAndTrack;
 import org.eclipse.e4.core.di.IInjector;
 import org.eclipse.e4.core.internal.contexts.EclipseContext;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.osgi.framework.FrameworkUtil;
 
 @SuppressWarnings("restriction")
@@ -44,7 +44,7 @@ public Object compute(IEclipseContext context, String contextKey) {
 
 	private int runCounter;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 		parentContext = EclipseContextFactory.create("EclipseContextTest" + "-parent");
 		context = parentContext.createChild("EclipseContextTest");
@@ -53,18 +53,18 @@ public void setUp() throws Exception {
 
 	@Test
 	public void testContainsKey() {
-		assertFalse("1.0", context.containsKey("function"));
-		assertFalse("1.1", context.containsKey("separator"));
+		assertFalse(context.containsKey("function"));
+		assertFalse(context.containsKey("separator"));
 
 		context.set("separator", ",");
-		assertTrue("2.1", context.containsKey("separator"));
+		assertTrue(context.containsKey("separator"));
 
 		// null value is still a value
 		context.set("separator", null);
-		assertTrue("3.0", context.containsKey("separator"));
+		assertTrue(context.containsKey("separator"));
 
 		context.remove("separator");
-		assertFalse("4.0", context.containsKey("separator"));
+		assertFalse(context.containsKey("separator"));
 	}
 
 	@Test

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/NeutralValueTest.java

@@ -13,17 +13,17 @@
  *******************************************************************************/
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-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.assertTrue;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.e4.core.internal.contexts.ConcurrentNeutralValueMap;
 import org.eclipse.e4.core.internal.contexts.ConcurrentNeutralValueMap.Value;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("restriction")
 public class NeutralValueTest {

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/ReparentingTest.java

@@ -15,10 +15,10 @@
 
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -29,7 +29,7 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.contexts.RunAndTrack;
 import org.eclipse.e4.core.internal.tests.contexts.inject.ObjectSuperClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test for changing a context's parent.
@@ -54,7 +54,7 @@ public void testContextFunctionInParentRemove() {
 		assertEquals(2, ((Integer) child.get("sum")).intValue());
 		child.setParent(EclipseContextFactory.create());
 		assertEquals(6, ((Integer) parent.get("sum")).intValue());
-		assertNull("Expected null but was: " + child.get("sum"), child.get("sum"));
+		assertNull(child.get("sum"), "Expected null but was: " + child.get("sum"));
 	}
 
 	/**

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/RunAndTrackTest.java

@@ -15,9 +15,9 @@
 
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,8 +27,8 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.contexts.RunAndTrack;
 import org.eclipse.e4.core.internal.tests.CoreTestsActivator;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for {@link org.eclipse.e4.core.contexts.RunAndTrack}.
@@ -118,7 +118,7 @@ private IEclipseContext[] createNextLevel(IEclipseContext parent, String prefix,
 		return contexts;
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() throws Exception {
 		for (IEclipseContext context : createdContexts) {
 			context.dispose();

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/StrongIterableTest.java

@@ -14,10 +14,10 @@
 
 package org.eclipse.e4.core.internal.tests.contexts;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
@@ -30,7 +30,7 @@
 import java.util.stream.StreamSupport;
 
 import org.eclipse.e4.core.internal.contexts.StrongIterable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("restriction")
 public class StrongIterableTest {

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/ActivationInjectionTest.java

@@ -15,7 +15,7 @@
 
 package org.eclipse.e4.core.internal.tests.contexts.inject;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -26,7 +26,7 @@
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ActivationInjectionTest {
 

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/AnnotationsInjectionTest.java

@@ -14,10 +14,10 @@
  *******************************************************************************/
 package org.eclipse.e4.core.internal.tests.contexts.inject;
 
-import static org.junit.Assert.assertEquals;
-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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -29,7 +29,7 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 /**
  * Tests for the basic context injection functionality
  */

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/Bug317183Test.java

@@ -15,12 +15,12 @@
 
 package org.eclipse.e4.core.internal.tests.contexts.inject;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.contexts.RunAndTrack;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class Bug317183Test {
 

runtime/tests/org.eclipse.e4.core.javax.tests/src/org/eclipse/e4/core/internal/tests/contexts/inject/ComplexDisposalTest.java

@@ -14,7 +14,7 @@
  ******************************************************************************/
 package org.eclipse.e4.core.internal.tests.contexts.inject;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
@@ -24,7 +24,7 @@
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * See bug 296337: duplicate disposal of an object
@@ -66,9 +66,9 @@ public void testU() {
 
 		assertEquals(0, test.getCount());
 		context.dispose();
-		assertEquals("Context disposed, @PreDestroy should've been called", 1, test.getCount());
+		assertEquals(1, test.getCount(), "Context disposed, @PreDestroy should've been called");
 		parentContext.dispose();
-		assertEquals("Parent context disposed, @PreDestroy should not have been called again", 1, test.getCount());
+		assertEquals(1, test.getCount(), "Parent context disposed, @PreDestroy should not have been called again");
 	}
 
 	@Test
@@ -81,9 +81,9 @@ public void testV() {
 
 		assertEquals(0, test.getCount());
 		context.dispose();
-		assertEquals("Context disposed, @PreDestroy should've been called", 1, test.getCount());
+		assertEquals(1, test.getCount(), "Context disposed, @PreDestroy should've been called");
 		parentContext.dispose();
-		assertEquals("Parent context disposed, @PreDestroy should not have been called again", 1, test.getCount());
+		assertEquals(1, test.getCount(), "Parent context disposed, @PreDestroy should not have been called again");
 	}
 
 	@Test
@@ -97,8 +97,8 @@ public void testW() {
 
 		assertEquals(0, test.getCount());
 		context.dispose();
-		assertEquals("Context disposed, @PreDestroy should've been called", 1, test.getCount());
+		assertEquals(1, test.getCount(), "Context disposed, @PreDestroy should've been called");
 		parentContext.dispose();
-		assertEquals("Parent context disposed, @PreDestroy should not have been called again", 1, test.getCount());
+		assertEquals(1, test.getCount(), "Parent context disposed, @PreDestroy should not have been called again");
 	}
 }