updated junit to junit 5

Author: irockel

tda/dependency-reduced-pom.xml

@@ -84,16 +84,24 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.10.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>junit-jupiter-api</artifactId>
+          <groupId>org.junit.jupiter</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>junit-jupiter-params</artifactId>
+          <groupId>org.junit.jupiter</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>junit-jupiter-engine</artifactId>
+          <groupId>org.junit.jupiter</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <properties>

tda/pom.xml

@@ -37,15 +37,9 @@
       <version>2.10.1</version>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <version>1.3</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.10.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

tda/src/test/java/RootSuite.java

@@ -26,37 +26,27 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.junit.jupiter.api.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
  * @author irockel
  */
-public class BeaJDKParserTest extends TestCase {
+public class BeaJDKParserTest {
 
-    public BeaJDKParserTest(String testName) {
-        super(testName);
-    }            
-
+    @BeforeEach
     protected void setUp() throws Exception {
-        super.setUp();
     }
 
+    @AfterEach
     protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-    
-    public static Test suite() {
-        TestSuite suite = new TestSuite(BeaJDKParserTest.class);
-        
-        return suite;
     }
 
     /**
      * Test of hasMoreDumps method, of class de.grimmfrost.tda.SunJDKParser.
      */
+    @Test
     public void testDumpLoad() throws FileNotFoundException, IOException {
         System.out.println("dumpLoad");
         FileInputStream fis = null;

tda/src/test/java/de/grimmfrost/tda/BeaJDKParserTest.java

@@ -23,35 +23,29 @@
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import junit.framework.*;
+import org.junit.jupiter.api.*;
+import static org.junit.jupiter.api.Assertions.*;
 import java.io.InputStream;
 import java.util.Map;
 
 /**
  *
  * @author irockel
  */
-public class DumpParserFactoryTest extends TestCase {
+public class DumpParserFactoryTest {
 
-    public DumpParserFactoryTest(String testName) {
-        super(testName);
-    }
-
+    @BeforeEach
     protected void setUp() throws Exception {
     }
 
+    @AfterEach
     protected void tearDown() throws Exception {
     }
 
-    public static Test suite() {
-        TestSuite suite = new TestSuite(DumpParserFactoryTest.class);
-        
-        return suite;
-    }
-
     /**
      * Test of get method, of class de.grimmfrost.tda.DumpParserFactory.
      */
+    @Test
     public void testGet() {
         System.out.println("get");
 
@@ -62,6 +56,7 @@ public void testGet() {
     /**
      * Test of getDumpParserForVersion method, of class de.grimmfrost.tda.DumpParserFactory.
      */
+    @Test
     public void testGetDumpParserForSunLogfile() throws FileNotFoundException {
         System.out.println("getDumpParserForVersion");
 
@@ -78,6 +73,7 @@ public void testGetDumpParserForSunLogfile() throws FileNotFoundException {
     /**
      * Test of getDumpParserForVersion method, of class de.grimmfrost.tda.DumpParserFactory.
      */
+    @Test
     public void testGetDumpParserForBeaLogfile() throws FileNotFoundException {
         System.out.println("getDumpParserForVersion");
 

tda/src/test/java/de/grimmfrost/tda/DumpParserFactoryTest.java

@@ -28,35 +28,29 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
-import junit.framework.*;
+import org.junit.jupiter.api.*;
+import static org.junit.jupiter.api.Assertions.*;
 import java.util.Map;
 import java.util.Vector;
 
 /**
  * test parsing of log files from sun vms.
  * @author irockel
  */
-public class SunJDKParserTest extends TestCase {
+public class SunJDKParserTest {
 
-    public SunJDKParserTest(String testName) {
-        super(testName);
-    }
-
+    @BeforeEach
     protected void setUp() throws Exception {
     }
 
+    @AfterEach
     protected void tearDown() throws Exception {
     }
 
-    public static Test suite() {
-        TestSuite suite = new TestSuite(SunJDKParserTest.class);
-        
-        return suite;
-    }
-
     /**
      * Test of hasMoreDumps method, of class de.grimmfrost.tda.SunJDKParser.
      */
+    @Test
     public void testDumpLoad() throws FileNotFoundException, IOException {
         System.out.println("dumpLoad");
         FileInputStream fis = null;
@@ -89,6 +83,7 @@ public void testDumpLoad() throws FileNotFoundException, IOException {
     /**
      * Test of isFoundClassHistograms method, of class de.grimmfrost.tda.SunJDKParser.
      */
+    @Test
     public void testIsFoundClassHistograms() throws FileNotFoundException, IOException {
         System.out.println("isFoundClassHistograms");
         DumpParser instance = null;
@@ -116,6 +111,7 @@ public void testIsFoundClassHistograms() throws FileNotFoundException, IOExcepti
         }
     }
 
+    @Test
     public void test64BitDumpLoad() throws FileNotFoundException, IOException {
         System.out.println("64BitDumpLoad");
         FileInputStream fis = null;
@@ -145,6 +141,7 @@ public void test64BitDumpLoad() throws FileNotFoundException, IOException {
         }
     }
 
+    @Test
     public void testJava8DumpLoad() throws FileNotFoundException, IOException {
         System.out.println("Java8DumpLoad");
         FileInputStream fis = null;
@@ -174,6 +171,7 @@ public void testJava8DumpLoad() throws FileNotFoundException, IOException {
         }
     }
 
+    @Test
     public void testJava11DumpLoad() throws FileNotFoundException, IOException {
         System.out.println("Java11DumpLoad");
         FileInputStream fis = null;
@@ -203,6 +201,7 @@ public void testJava11DumpLoad() throws FileNotFoundException, IOException {
         }
     }
 
+    @Test
     public void testHPDumps()  throws FileNotFoundException, IOException {
         System.out.println("HPDumpLoad");
         FileInputStream fis = null;
@@ -232,6 +231,7 @@ public void testHPDumps()  throws FileNotFoundException, IOException {
         }
     }
 
+    @Test
     public void testRemoteVisualVMDumps()  throws FileNotFoundException, IOException {
         System.out.println("VisualVMDumpLoad");
         FileInputStream fis = null;
@@ -261,6 +261,7 @@ public void testRemoteVisualVMDumps()  throws FileNotFoundException, IOException
         }
     }
 
+    @Test
     public void testURLThreadNameDumps()  throws FileNotFoundException, IOException {
         System.out.println("URLThreadNameDumpLoad");
         FileInputStream fis = null;
@@ -290,6 +291,7 @@ public void testURLThreadNameDumps()  throws FileNotFoundException, IOException
         }
     }
 
+    @Test
     public void testVirtualThreadDumps() throws FileNotFoundException, IOException {
         System.out.println("VirtualThreadDumpLoad");
         FileInputStream fis = null;
@@ -319,6 +321,7 @@ public void testVirtualThreadDumps() throws FileNotFoundException, IOException {
         }
     }
 
+    @Test
     public void testLongRunningDetectionWithVariableFields() throws FileNotFoundException, IOException {
         System.out.println("testLongRunningDetectionWithVariableFields");
         FileInputStream fis = null;
@@ -364,11 +367,11 @@ public void testLongRunningDetectionWithVariableFields() throws FileNotFoundExce
             instance.findLongRunningThreads(root, dumpMap, paths, 2, null);
 
             // Check if long running threads were found
-            assertTrue("Should have children", root.getChildCount() > 0);
+            assertTrue(root.getChildCount() > 0, "Should have children");
             DefaultMutableTreeNode resultNode = (DefaultMutableTreeNode) root.getChildAt(0);
 
             // We expect at least 2 long running threads ("C2 CompilerThread0" and "VM Periodic Task Thread")
-            assertTrue("Should find at least one long running thread, found: " + resultNode.getChildCount(), resultNode.getChildCount() > 0);
+            assertTrue(resultNode.getChildCount() > 0, "Should find at least one long running thread, found: " + resultNode.getChildCount());
 
         } finally {
             if(instance != null) {