Fix for #141 (#144)

helbaroudy · web-flow · commit ea9942da129d · 2022-04-10T00:20:37.000+02:00
* Add test to reproduce issue #141 * Fix assumption on test to match expected behaviour expressed on #141 * Make "/" after "virtual" directories mandatory Now the regex only matches with "a/", "b/", "new/" and "old/", previously the slash was taken as optional. fixes #141
diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffReader.java
@@ -353,7 +353,7 @@ private String extractFileName(String _line) {
             line = line.substring(0, matcher.start());
         }
         line = line.split("\t")[0];
-        return line.substring(4).replaceFirst("^(a|b|old|new)(\\/)?", "")
+        return line.substring(4).replaceFirst("^(a|b|old|new)/", "")
                 .trim();
     }
 
diff --git a/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java b/java-diff-utils/src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java
@@ -122,7 +122,7 @@ public void testParseIssue46() throws IOException {
         assertThat(diff.getFiles().size()).isEqualTo(1);
 
         UnifiedDiffFile file1 = diff.getFiles().get(0);
-        assertThat(file1.getFromFile()).isEqualTo(".vhd");
+        assertThat(file1.getFromFile()).isEqualTo("a.vhd");
         assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
 
         assertThat(diff.getTail()).isNull();
@@ -384,4 +384,14 @@ public void testParseIssue123() throws IOException {
 
         assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java");
     }
+
+    @Test
+    public void testParseIssue141() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue141.diff"));
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+
+        assertThat(file1.getFromFile()).isEqualTo("a.txt");
+        assertThat(file1.getToFile()).isEqualTo("a1.txt");
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue141.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue141.diff
@@ -0,0 +1,11 @@
+--- a.txt
++++ a1.txt
+@@ -8,7 +8,7 @@
+     <Setting>
+         <Setting a>
+             <setting b>
+-                <value>23</value>
++                <value>24</value>
+             </setting b>
+             <setting c>
+                 <value>1</value>

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ private String extractFileName(String _line) {`
`353`	`353`	`line = line.substring(0, matcher.start());`
`354`	`354`	`}`
`355`	`355`	`line = line.split("\t")[0];`
`356`		`- return line.substring(4).replaceFirst("^(a\|b\|old\|new)(\\/)?", "")`
	`356`	`+ return line.substring(4).replaceFirst("^(a\|b\|old\|new)/", "")`
`357`	`357`	`.trim();`
`358`	`358`	`}`
`359`	`359`