Add test to reproduce issue #141

helbaroudy · helbaroudy · commit e17a00676f46 · 2022-03-16T00:29:39.000+01:00
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
@@ -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
`@@ -384,4 +384,14 @@ public void testParseIssue123() throws IOException {`
`384`	`384`
`385`	`385`	`assertThat(diff.getFiles()).extracting(f -> f.getFromFile()).contains("src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java");`
`386`	`386`	`}`
	`387`	`+`
	`388`	`+ @Test`
	`389`	`+ public void testParseIssue141() throws IOException {`
	`390`	`+ UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(`
	`391`	`+ UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue141.diff"));`
	`392`	`+ UnifiedDiffFile file1 = diff.getFiles().get(0);`
	`393`	`+`
	`394`	`+ assertThat(file1.getFromFile()).isEqualTo("a.txt");`
	`395`	`+ assertThat(file1.getToFile()).isEqualTo("a1.txt");`
	`396`	`+ }`
`387`	`397`	`}`