Migrate to JUnit 5

RSTALanguageSupport/build.gradle

@@ -8,7 +8,6 @@ dependencies {
     api 'com.fifesoft:rsyntaxtextarea:3.3.0'
     api 'com.fifesoft:autocomplete:3.3.0'
     implementation 'org.mozilla:rhino-all:1.8.0'
-    testImplementation 'junit:junit:4.13.2'
 }
 
 base {
@@ -30,6 +29,18 @@ jar {
                 'Implementation-Version': version)
     }
 }
+test {
+    testLogging {
+        events 'failed' //, 'passed', 'skipped', 'standardOut', 'standardError'
+
+        showExceptions = true
+        exceptionFormat = 'full'
+        showCauses = true
+        showStackTraces = true
+
+        showStandardStreams = false
+    }
+}
 
 publishing {
     repositories {

RSTALanguageSupport/src/test/java/org/fife/rsta/ac/java/rjc/parser/ClassAndLocalVariablesTest.java

@@ -16,8 +16,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.fife.rsta.ac.java.rjc.ast.CodeBlock;
 import org.fife.rsta.ac.java.rjc.ast.CompilationUnit;
 import org.fife.rsta.ac.java.rjc.ast.Field;
@@ -28,6 +26,10 @@
 import org.fife.rsta.ac.java.rjc.ast.Method;
 import org.fife.rsta.ac.java.rjc.ast.TypeDeclaration;
 import org.fife.rsta.ac.java.rjc.lexer.Scanner;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 
 /**
@@ -42,20 +44,11 @@
  * @author Robert Futrell
  * @version 1.0
  */
-public class ClassAndLocalVariablesTest extends TestCase {
+class ClassAndLocalVariablesTest {
 
 	private CompilationUnit cu;
 
 
-	public ClassAndLocalVariablesTest() {
-		try {
-			cu = createCompilationUnit();
-		} catch (IOException ioe) {
-			ioe.printStackTrace();
-		}
-	}
-
-
 	private CompilationUnit createCompilationUnit() throws IOException {
 		//InputStream in = getClass().getResourceAsStream("tests/SimpleClass.java");
 		BufferedReader r = new BufferedReader(//new InputStreamReader(in));
@@ -68,19 +61,17 @@ private CompilationUnit createCompilationUnit() throws IOException {
 	}
 
 
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
+	@BeforeEach
+	void setUp() {
+		try {
+			cu = createCompilationUnit();
+		} catch (IOException ioe) {
+			fail("Failed to create CompilationUnit for test", ioe);
+		}
 	}
 
-
-	public void testImports() {
+	@Test
+	void testImports() {
 
 		assertEquals(4, cu.getImportCount());
 
@@ -111,7 +102,8 @@ public void testImports() {
 	}
 
 
-	public void testMembers() {
+	@Test
+	void testMembers() {
 
 		// A single class is defined
 		assertEquals(1, cu.getTypeDeclarationCount());
@@ -129,7 +121,7 @@ public void testMembers() {
 		Iterator<Member> i = typeDec.getMemberIterator();
 
 		Member member = i.next();
-		assertTrue(member instanceof Field);
+		assertInstanceOf(Field.class, member);
 		Field field = (Field)member;
 		assertEquals("int", field.getType().toString());
 		assertEquals("classInt1", field.getName());
@@ -138,15 +130,15 @@ public void testMembers() {
                 field.getDocComment().contains("A member int variable."));
 
 		member = i.next();
-		assertTrue(member instanceof Field);
+		assertInstanceOf(Field.class, member);
 		field = (Field)member;
 		assertEquals("int", field.getType().toString());
 		assertEquals("classInt2", field.getName());
 		assertTrue(field.getModifiers().isProtected());
         assertNull(field.getDocComment());
 
 		member = i.next();
-		assertTrue(member instanceof Field);
+		assertInstanceOf(Field.class, member);
 		field = (Field)member;
 		assertEquals("String", field.getType().toString());
 		assertEquals("classStr1", field.getName());
@@ -155,37 +147,37 @@ public void testMembers() {
                 field.getDocComment().contains("A string member variable."));
 
 		member = i.next();
-		assertTrue(member instanceof Field);
+		assertInstanceOf(Field.class, member);
 		field = (Field)member;
 		assertEquals("list", field.getName());
 		assertEquals("List<Double>", field.getType().toString());
 		assertTrue(field.getModifiers().isPrivate());
         assertNull(field.getDocComment());
 
 		member = i.next();
-		assertTrue(member instanceof Method);
+		assertInstanceOf(Method.class, member);
 		Method method = (Method)member;
 		assertEquals("SimpleClass", method.getName());
 		assertTrue(method.getModifiers().isPublic());
 		assertTrue(method.isConstructor());
 
 		member = i.next();
-		assertTrue(member instanceof Method);
+		assertInstanceOf(Method.class, member);
 		method = (Method)member;
 		assertEquals("getValue", method.getName());
 		assertTrue(method.getModifiers().isPublic());
 		assertTrue(method.getDocComment()!=null &&
                 method.getDocComment().contains("Returns a value."));
 
 		member = i.next();
-		assertTrue(member instanceof Method);
+		assertInstanceOf(Method.class, member);
 		method = (Method)member;
 		assertEquals("computeValue", method.getName());
 		assertTrue(method.getModifiers().isPrivate());
 		assertNull(method.getDocComment());
 
 		member = i.next();
-		assertTrue(member instanceof Method);
+		assertInstanceOf(Method.class, member);
 		method = (Method)member;
 		assertEquals("localVarsComplex", method.getName());
 		assertTrue(method.getModifiers().isPublic());
@@ -197,15 +189,16 @@ public void testMembers() {
 		assertEquals("unused", param.getName());
 
 		member = i.next();
-		assertTrue(member instanceof Method);
+		assertInstanceOf(Method.class, member);
 		method = (Method)member;
 		assertEquals("localVarsSimple", method.getName());
 		assertTrue(method.getModifiers().isPublic());
 
 	}
 
 
-	public void testLocalVariablesComplex() {
+	@Test
+	void testLocalVariablesComplex() {
 
 		TypeDeclaration td = cu.getTypeDeclaration(0);
 		List<Method> methods = td.getMethodsByName("localVarsComplex");
@@ -227,7 +220,8 @@ public void testLocalVariablesComplex() {
 	}
 
 
-	public void testLocalVariablesSimple() {
+	@Test
+	void testLocalVariablesSimple() {
 
 		TypeDeclaration td = cu.getTypeDeclaration(0);
 		List<Method> methods = td.getMethodsByName("localVarsSimple");

build.gradle

@@ -34,6 +34,10 @@ subprojects {
     apply plugin: 'checkstyle'
 //    apply plugin: 'com.github.spotbugs'
 
+    test {
+        useJUnitPlatform()
+    }
+
     checkstyle {
         toolVersion = '10.25.0'
         configDirectory = file("$rootProject.projectDir/config/checkstyle")
@@ -60,6 +64,12 @@ subprojects {
 //        }
 //    }
 
+    dependencies {
+        testImplementation platform('org.junit:junit-bom:5.13.1')
+        testImplementation 'org.junit.jupiter:junit-jupiter'
+        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    }
+
     compileJava {
         options.release = Integer.parseInt(javaLanguageVersion)
         options.debug = true