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

This commit is contained in:
Axel Uhl
2025-07-04 10:08:10 +02:00
33 changed files with 318 additions and 18 deletions
@@ -12,7 +12,5 @@ Require-Bundle: junit-jupiter-api;bundle-version="5.12.2",
junit-jupiter-engine;bundle-version="5.12.2",
junit-platform-commons;bundle-version="1.12.2",
junit-platform-engine;bundle-version="1.12.2",
org.opentest4j;bundle-version="1.3.0",
org.junit,
org.junit.jupiter.api
org.opentest4j;bundle-version="1.3.0"
Automatic-Module-Name: com.googlecode.java-diff-utils.test
@@ -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"));
@@ -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;