Use JUnit 5

Change all dependencies for Maven and Eclipse from JUnit 4 to JUnit 5
and convert all the JUnit API to JUnit Jupiter. This allows running the
existing tests as JUnit 5 tests in Maven and Eclipse (given a recent
Eclipse IDE).

Author: Bananeweizen

net.sf.eclipsecs.checkstyle/.classpath

@@ -13,6 +13,6 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

net.sf.eclipsecs.checkstyle/test/net/sf/eclipsecs/checkstyle/ChecksTest.java

@@ -1,12 +1,13 @@
 package net.sf.eclipsecs.checkstyle.utils;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.junit.Assert;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.EntityResolver;
@@ -42,7 +43,7 @@ public InputSource resolveEntity(String publicId, String systemId)
 
       rawXml = builder.parse(new InputSource(new StringReader(code)));
     } catch (IOException | SAXException ex) {
-      Assert.fail(fileName + " has invalid xml (" + ex.getMessage() + "): " + unserializedSource);
+      fail(fileName + " has invalid xml (" + ex.getMessage() + "): " + unserializedSource);
     }
 
     return rawXml;

net.sf.eclipsecs.checkstyle/test/net/sf/eclipsecs/checkstyle/utils/XmlUtil.java

@@ -1,13 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse Checkstyle" sequenceNumber="1590429360">
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Eclipse Checkstyle" sequenceNumber="1591014598">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
       <unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/juno/201303010900/"/>
+      <repository location="https://download.eclipse.org/releases/juno/201303010900/"/>
+    </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.junit.jupiter.api" version="0.0.0"/>
+      <unit id="org.junit.jupiter.engine" version="0.0.0"/>
+      <unit id="org.junit.jupiter.params" version="0.0.0"/>
+      <unit id="org.junit.platform.commons" version="0.0.0"/>
+      <unit id="org.junit.platform.engine" version="0.0.0"/>
+      <unit id="org.junit.platform.launcher" version="0.0.0"/>
+      <unit id="org.junit.platform.runner" version="0.0.0"/>
+      <unit id="org.junit.platform.suite.api" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
     </location>
   </locations>
   <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

net.sf.eclipsecs.target/net.sf.eclipsecs.target.target

@@ -1,14 +1,26 @@
-// Install http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/ to use this target definition.
+// Install https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/ to use this target definition.
 // Read https://github.com/eclipse-cbi/targetplatform-dsl for more details.
 target "Eclipse Checkstyle"
 with source configurePhase
 environment JavaSE-1.8
 
 // use the latest version of Juno only, to avoid downloading all children of the Juno composite update site
-location "http://download.eclipse.org/releases/juno/201303010900/" {
+location "https://download.eclipse.org/releases/juno/201303010900/" {
 	org.eclipse.jdt.feature.group lazy
 	org.eclipse.sdk.ide lazy
 
 	// e4.ui has dependencies to EMF, those are not actually needed by eclipse-cs itself
 	org.eclipse.emf.feature.group lazy
 }
+
+// latest release of JUnit 5 from Eclipse Orbit
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository" {
+	org.junit.jupiter.api lazy
+	org.junit.jupiter.engine lazy
+	org.junit.jupiter.params lazy
+	org.junit.platform.commons lazy
+	org.junit.platform.engine lazy
+	org.junit.platform.launcher lazy
+	org.junit.platform.runner lazy
+	org.junit.platform.suite.api lazy
+}

net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd

@@ -15,6 +15,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.19.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jfreechart-1.0.19-swt.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jcommon-1.0.23.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

net.sf.eclipsecs.ui/.classpath

@@ -2,6 +2,9 @@
 
 import com.google.common.base.Strings;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -16,22 +19,20 @@
 import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.text.edits.TextEdit;
-import org.junit.Assert;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import junit.framework.TestCase;
 
-public abstract class AbstractQuickfixTestCase extends TestCase {
+public abstract class AbstractQuickfixTestCase {
 
   protected void testQuickfix(final String testDataXml, final AbstractASTResolution quickfix)
           throws Exception {
     InputStream stream = getClass().getResourceAsStream(testDataXml);
-    assertNotNull("Cannot find resource " + testDataXml + " in package "
-            + getClass().getPackage().getName(), stream);
+    assertNotNull(stream, "Cannot find resource " + testDataXml + " in package "
+            + getClass().getPackage().getName());
     try {
       System.out.println(
               "Test quickfix " + quickfix.getClass() + " with input file `" + testDataXml + "`");
@@ -73,7 +74,7 @@ protected void testQuickfix(InputStream testdataStream, AbstractASTResolution qu
       TextEdit edit = compUnit.rewrite(doc, options);
       edit.apply(doc);
 
-      Assert.assertEquals(testdata[i].result, doc.get());
+      assertEquals(testdata[i].result, doc.get());
     }
 
   }

net.sf.eclipsecs.ui/test/net/sf/eclipsecs/ui/quickfixes/AbstractQuickfixTestCase.java

@@ -1,10 +1,13 @@
 
 package net.sf.eclipsecs.ui.quickfixes.blocks;
 
+import org.junit.jupiter.api.Test;
+
 import net.sf.eclipsecs.ui.quickfixes.AbstractQuickfixTestCase;
 
 public class AvoidNestedBlocksTest extends AbstractQuickfixTestCase {
 
+  @Test
   public void testAvoidNestedBlocks() throws Exception {
     testQuickfix("AvoidNestedBlocksInput.xml", new AvoidNestedBlocksQuickfix());
   }

net.sf.eclipsecs.ui/test/net/sf/eclipsecs/ui/quickfixes/blocks/AvoidNestedBlocksTest.java

@@ -1,30 +1,38 @@
 
 package net.sf.eclipsecs.ui.quickfixes.blocks;
 
+import org.junit.jupiter.api.Test;
+
 import net.sf.eclipsecs.ui.quickfixes.AbstractQuickfixTestCase;
 
 public class NeedBracesTest extends AbstractQuickfixTestCase {
 
+  @Test
   public void testNeedBracesIf() throws Exception {
     testQuickfix("NeedBracesInputIf.xml", new NeedBracesQuickfix());
   }
 
+  @Test
   public void testNeedBracesElse() throws Exception {
     testQuickfix("NeedBracesInputElse.xml", new NeedBracesQuickfix());
   }
 
+  @Test
   public void testNeedBracesElseIf() throws Exception {
     testQuickfix("NeedBracesInputElseIf.xml", new NeedBracesQuickfix());
   }
 
+  @Test
   public void testNeedBracesFor() throws Exception {
     testQuickfix("NeedBracesInputFor.xml", new NeedBracesQuickfix());
   }
 
+  @Test
   public void testNeedBracesWhile() throws Exception {
     testQuickfix("NeedBracesInputWhile.xml", new NeedBracesQuickfix());
   }
 
+  @Test
   public void testNeedBracesDoWhile() throws Exception {
     testQuickfix("NeedBracesInputDoWhile.xml", new NeedBracesQuickfix());
   }

net.sf.eclipsecs.ui/test/net/sf/eclipsecs/ui/quickfixes/blocks/NeedBracesTest.java

@@ -1,14 +1,18 @@
 
 package net.sf.eclipsecs.ui.quickfixes.coding;
 
+import org.junit.jupiter.api.Test;
+
 import net.sf.eclipsecs.ui.quickfixes.AbstractQuickfixTestCase;
 
 public class DefaultComesLastTest extends AbstractQuickfixTestCase {
 
+  @Test
   public void testDefaultComesLast() throws Exception {
     testQuickfix("DefaultComesLastInput.xml", new DefaultComesLastQuickfix());
   }
 
+  @Test
   public void testDefaultComesLastInner() throws Exception {
     testQuickfix("DefaultComesLastInputInner.xml", new DefaultComesLastQuickfix());
   }