fixes #197 - corrected revised filename output

wumpz · wumpz · commit 527e83cee1ba · 2025-02-05T21:25:54.000+01:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java
@@ -352,7 +352,7 @@ public static List<String> generateOriginalAndDiff(List<String> original, List<S
      */
     public static List<String> generateOriginalAndDiff(List<String> original, List<String> revised, String originalFileName, String revisedFileName) {
         String originalFileNameTemp = originalFileName;
-        String revisedFileNameTemp = originalFileName;
+        String revisedFileNameTemp = revisedFileName;
         if (originalFileNameTemp == null) {
             originalFileNameTemp = "original";
         }
diff --git a/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java b/java-diff-utils/src/test/java/com/github/difflib/GenerateUnifiedDiffTest.java
@@ -51,8 +51,14 @@ public void testGenerateUnifiedWithOneDelta() throws IOException {
     @Test
     public void testGenerateUnifiedDiffWithoutAnyDeltas() {
         List<String> test = Arrays.asList("abc");
-        Patch<String> patch = DiffUtils.diff(test, test);
-        UnifiedDiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0);
+        List<String> testRevised = Arrays.asList("abc2");
+        Patch<String> patch = DiffUtils.diff(test, testRevised);
+        String unifiedDiffTxt = String.join("\n", UnifiedDiffUtils.generateUnifiedDiff("abc1", "abc2", test, patch, 0));
+        System.out.println(unifiedDiffTxt);
+        
+        assertThat(unifiedDiffTxt)
+                .as("original filename should be abc1").contains("--- abc1")
+                .as("revised filename should be abc2").contains("+++ abc2");
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ public static List<String> generateOriginalAndDiff(List<String> original, List<S`
`352`	`352`	`*/`
`353`	`353`	`public static List<String> generateOriginalAndDiff(List<String> original, List<String> revised, String originalFileName, String revisedFileName) {`
`354`	`354`	`String originalFileNameTemp = originalFileName;`
`355`		`- String revisedFileNameTemp = originalFileName;`
	`355`	`+ String revisedFileNameTemp = revisedFileName;`
`356`	`356`	`if (originalFileNameTemp == null) {`
`357`	`357`	`originalFileNameTemp = "original";`
`358`	`358`	`}`