fixes #80

wumpz · wumpz · commit 7620f919c256 · 2020-05-24T22:56:28.000+02:00
diff --git a/java-diff-utils/pom.xml b/java-diff-utils/pom.xml
@@ -51,6 +51,15 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <java.util.logging.config.file>target/test-classes/logging.properties</java.util.logging.config.file>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
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
@@ -66,11 +66,11 @@ public final class UnifiedDiffReader {
     // [/^-/, del], [/^\+/, add], [/^\\ No newline at end of file$/, eof]];
     private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {
         String headerTxt = "";
-        LOG.log(Level.INFO, "header parsing");
+        LOG.log(Level.FINE, "header parsing");
         String line = null;
         while (READER.ready()) {
             line = READER.readLine();
-            LOG.log(Level.INFO, "parsing line {0}", line);
+            LOG.log(Level.FINE, "parsing line {0}", line);
             if (DIFF_COMMAND.validLine(line) || INDEX.validLine(line)
                     || FROM_FILE.validLine(line) || TO_FILE.validLine(line)) {
                 break;
@@ -139,11 +139,11 @@ public static UnifiedDiff parseUnifiedDiff(InputStream stream) throws IOExceptio
     private boolean processLine(String line, UnifiedDiffLine... rules) throws UnifiedDiffParserException {
         for (UnifiedDiffLine rule : rules) {
             if (rule.processLine(line)) {
-                LOG.info("  >>> processed rule " + rule.toString());
+                LOG.fine("  >>> processed rule " + rule.toString());
                 return true;
             }
         }
-        LOG.info("  >>> no rule matched " + line);
+        LOG.warning("  >>> no rule matched " + line);
         return false;
         //throw new UnifiedDiffParserException("parsing error at line " + line);
     }
@@ -161,7 +161,7 @@ private void initFileIfNecessary() {
 
     private void processDiff(MatchResult match, String line) {
         //initFileIfNecessary();
-        LOG.log(Level.INFO, "start {0}", line);
+        LOG.log(Level.FINE, "start {0}", line);
         String[] fromTo = parseFileNames(READER.lastLine());
         actualFile.setFromFile(fromTo[0]);
         actualFile.setToFile(fromTo[1]);
@@ -223,7 +223,7 @@ private static Integer toInteger(MatchResult match, int group, int defValue) thr
 
     private void processIndex(MatchResult match, String line) {
         //initFileIfNecessary();
-        LOG.log(Level.INFO, "index {0}", line);
+        LOG.log(Level.FINE, "index {0}", line);
         actualFile.setIndex(line.substring(6));
     }
 
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
@@ -157,4 +157,19 @@ public void testParseIssue51() throws IOException {
 
         assertThat(diff.getTail()).isNull();
     }
+    
+    @Test
+    public void testParseIssue79() throws IOException {
+        UnifiedDiff diff = UnifiedDiffReader.parseUnifiedDiff(
+                UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue79.diff"));
+
+        assertThat(diff.getFiles().size()).isEqualTo(1);
+
+        UnifiedDiffFile file1 = diff.getFiles().get(0);
+        assertThat(file1.getFromFile()).isEqualTo("Main.java");
+        assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);
+
+        assertThat(diff.getTail()).isNull();
+        assertThat(diff.getHeader()).isNull();
+    }
 }
diff --git a/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue79.diff b/java-diff-utils/src/test/resources/com/github/difflib/unifieddiff/problem_diff_issue79.diff
@@ -0,0 +1,3 @@
+diff --git a/test/Issue.java b/test/Issue.java
+new file mode 100644
+index 00000000..9702606e
diff --git a/java-diff-utils/src/test/resources/logging.properties b/java-diff-utils/src/test/resources/logging.properties
@@ -0,0 +1,8 @@
+handlers=java.util.logging.ConsoleHandler
+
+.level=INFO
+com.github.difflib.unifieddiff.level=FINE
+
+java.util.logging.ConsoleHandler.level=INFO
+#java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+diff --git a/test/Issue.java b/test/Issue.java`
	`2`	`+new file mode 100644`
	`3`	`+index 00000000..9702606e`