bug6127: more JUnit5 migrations; still to do: selenium and domain.test

java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java

@@ -1,14 +1,22 @@
 package diffutils;
 
-import difflib.*;
-import junit.framework.TestCase;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class DiffTest extends TestCase {
+import difflib.ChangeDelta;
+import difflib.Chunk;
+import difflib.DeleteDelta;
+import difflib.Delta;
+import difflib.DiffUtils;
+import difflib.InsertDelta;
+import difflib.Patch;
+
+public class DiffTest {
 
     public void testDiff_Insert() {
         final Patch<String> patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk"));

java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java

@@ -1,9 +1,7 @@
 package diffutils;
 
-import difflib.DiffUtils;
-import difflib.Patch;
-import difflib.PatchFailedException;
-import junit.framework.TestCase;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -14,7 +12,11 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
-public class GenerateUnifiedDiffTest extends TestCase {
+import difflib.DiffUtils;
+import difflib.Patch;
+import difflib.PatchFailedException;
+
+public class GenerateUnifiedDiffTest {
     private static final String FS = File.separator;
     private static final String MOCK_FOLDER = "test" + FS + "mocks" + FS;
 

java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java

@@ -1,15 +1,17 @@
 package diffutils;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.TestCase;
 import difflib.DiffUtils;
 import difflib.Patch;
 import difflib.PatchFailedException;
 
-public class PatchTest extends TestCase {
+public class PatchTest {
 
     public void testPatch_Insert()  {
         final List<String> insertTest_from = Arrays.asList("hhh");