Merge branch 'main' into bug6135; fixed junit5 migration for com.googlecode.java-diff-utils

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

@@ -2,13 +2,13 @@ package diffutils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.junit.jupiter.api.Test;
 
 import difflib.ChangeDelta;
 import difflib.Chunk;
@@ -19,6 +19,7 @@ import difflib.InsertDelta;
 import difflib.Patch;
 
 public class DiffTest {
+
     @Test
     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

@@ -2,7 +2,6 @@ package diffutils;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.jupiter.api.Test;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -13,6 +12,8 @@ import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.junit.jupiter.api.Test;
+
 import difflib.DiffUtils;
 import difflib.Patch;
 import difflib.PatchFailedException;