Migrate org.eclipse.e4.emf.xpath.tests to JUnit 5

- Exchange annotations including test suites
- Exchange assertions

Author: HeikoKlare

tests/org.eclipse.e4.emf.xpath.test/E4 EMF Xpath Test Suite.launch

@@ -23,9 +23,9 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit5"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.e4.emf.xpath.test.EMFTestSuite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.e4.emf.xpath.test"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

tests/org.eclipse.e4.emf.xpath.test/META-INF/MANIFEST.MF

@@ -9,10 +9,12 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.e4.emf.xpath.test.model.xpathtest,
  org.eclipse.e4.emf.xpath.test.model.xpathtest.impl,
  org.eclipse.e4.emf.xpath.test.model.xpathtest.util
-Import-Package: org.assertj.core.api;version="[3.27.0,4.0.0)"
+Import-Package: org.assertj.core.api;version="[3.27.0,4.0.0)",
+ org.junit.jupiter.api,
+ org.junit.jupiter.api.function,
+ org.junit.platform.suite.api
 Require-Bundle: org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.emf.xpath,
- org.junit,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore,

tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/EMFTestSuite.java

@@ -14,14 +14,14 @@
 
 package org.eclipse.e4.emf.xpath.test;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
 
-@RunWith(Suite.class)
-@SuiteClasses({
-		ExampleQueriesTestCase.class,
-		ExampleQueriesApplicationTest.class })
+@Suite
+@SelectClasses({ //
+		ExampleQueriesTestCase.class, //
+		ExampleQueriesApplicationTest.class, //
+})
 public class EMFTestSuite {
 
 }

tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/ExampleQueriesApplicationTest.java

@@ -14,8 +14,8 @@
 package org.eclipse.e4.emf.xpath.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.List;
 
@@ -38,9 +38,9 @@
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-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({ "deprecation", "removal" })
 public class ExampleQueriesApplicationTest {
@@ -52,7 +52,7 @@ public class ExampleQueriesApplicationTest {
 	private Resource childResource;
 
 	@SuppressWarnings("restriction")
-	@Before
+	@BeforeEach
 	public void setUp() {
 		resourceSet = new ResourceSetImpl();
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
@@ -76,7 +76,7 @@ public void setUp() {
 		xpathChildContext = f.newContext(childResource.getContents().get(0));
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		xpathContext = null;
 		resource.unload();

tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/ExampleQueriesTestCase.java

@@ -15,12 +15,12 @@
 package org.eclipse.e4.emf.xpath.test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThrows;
-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.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Iterator;
 import java.util.List;
@@ -39,9 +39,9 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-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({ "deprecation", "removal" })
 public class ExampleQueriesTestCase {
@@ -51,7 +51,7 @@ public class ExampleQueriesTestCase {
 	private Resource resource;
 	private XPathContextFactory<EObject> xpathContextFactory;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		resourceSet = new ResourceSetImpl();
 		resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
@@ -65,7 +65,7 @@ public void setUp() {
 		xpathContext = xpathContextFactory.newContext(resource.getContents().get(0));
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		xpathContext = null;
 		xpathContextFactory = null;