Allowing absent source in Checkstyle parser #23

tomasbjerre · Sep 1, 2017 · dd52241 · dd52241
1 parent 3e1965d
commit dd52241
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 15 deletions.
diff --git a/src/main/java/se/bjurr/violations/lib/parsers/CheckStyleParser.java b/src/main/java/se/bjurr/violations/lib/parsers/CheckStyleParser.java
@@ -4,6 +4,7 @@
 import static se.bjurr.violations.lib.model.SEVERITY.INFO;
 import static se.bjurr.violations.lib.model.SEVERITY.WARN;
 import static se.bjurr.violations.lib.model.Violation.violationBuilder;
+import static se.bjurr.violations.lib.parsers.ViolationParserUtils.findAttribute;
 import static se.bjurr.violations.lib.parsers.ViolationParserUtils.findIntegerAttribute;
 import static se.bjurr.violations.lib.parsers.ViolationParserUtils.getAttribute;
 import static se.bjurr.violations.lib.parsers.ViolationParserUtils.getChunks;
@@ -12,6 +13,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import se.bjurr.violations.lib.model.SEVERITY;
 import se.bjurr.violations.lib.model.Violation;
 import se.bjurr.violations.lib.util.Optional;
@@ -20,17 +22,17 @@ public class CheckStyleParser implements ViolationsParser {
 
   @Override
   public List<Violation> parseReportOutput(String string) throws Exception {
-    List<Violation> violations = new ArrayList<>();
-    List<String> files = getChunks(string, "<file", "</file>");
-    for (String fileChunk : files) {
-      String filename = getAttribute(fileChunk, "name");
-      List<String> errors = getChunks(fileChunk, "<error", "/>");
-      for (String errorChunk : errors) {
-        Integer line = getIntegerAttribute(errorChunk, "line");
-        Optional<Integer> column = findIntegerAttribute(errorChunk, "column");
-        String severity = getAttribute(errorChunk, "severity");
-        String message = getAttribute(errorChunk, "message");
-        String rule = getAttribute(errorChunk, "source");
+    final List<Violation> violations = new ArrayList<>();
+    final List<String> files = getChunks(string, "<file", "</file>");
+    for (final String fileChunk : files) {
+      final String filename = getAttribute(fileChunk, "name");
+      final List<String> errors = getChunks(fileChunk, "<error", "/>");
+      for (final String errorChunk : errors) {
+        final Integer line = getIntegerAttribute(errorChunk, "line");
+        final Optional<Integer> column = findIntegerAttribute(errorChunk, "column");
+        final String severity = getAttribute(errorChunk, "severity");
+        final String message = getAttribute(errorChunk, "message");
+        final String rule = findAttribute(errorChunk, "source").orNull();
         violations.add( //
             violationBuilder() //
                 .setParser(CHECKSTYLE) //

diff --git a/src/test/java/se/bjurr/violations/lib/CheckstyleTest.java b/src/test/java/se/bjurr/violations/lib/CheckstyleTest.java
@@ -10,16 +10,18 @@
 import static se.bjurr.violations.lib.reports.Parser.CHECKSTYLE;
 
 import java.util.List;
+
 import org.junit.Test;
+
 import se.bjurr.violations.lib.model.Violation;
 
 public class CheckstyleTest {
 
   @Test
   public void testThatViolationsCanBeParsed() {
-    String rootFolder = getRootFolder();
+    final String rootFolder = getRootFolder();
 
-    List<Violation> actual =
+    final List<Violation> actual =
         violationsReporterApi() //
             .withPattern(".*/checkstyle/main\\.xml$") //
             .inFolder(rootFolder) //
@@ -79,9 +81,9 @@ public void testThatViolationsCanBeParsed() {
 
   @Test
   public void testThatPHPViolationsCanBeParsed() {
-    String rootFolder = getRootFolder();
+    final String rootFolder = getRootFolder();
 
-    List<Violation> actual =
+    final List<Violation> actual =
         violationsReporterApi() //
             .withPattern(".*/checkstyle/phpcheckstyle\\.xml$") //
             .inFolder(rootFolder) //
@@ -97,4 +99,25 @@ public void testThatPHPViolationsCanBeParsed() {
     assertThat(actual.get(0).getReporter()) //
         .isEqualTo("PHP");
   }
+
+  @Test
+  public void testThatPHPViolationsCanBeParsedIfNoSource() {
+    final String rootFolder = getRootFolder();
+
+    final List<Violation> actual =
+        violationsReporterApi() //
+            .withPattern(".*/checkstyle/checkstyle-no-source\\.xml$") //
+            .inFolder(rootFolder) //
+            .findAll(CHECKSTYLE) //
+            .withReporter("PHP") //
+            .violations();
+
+    assertThat(actual) //
+        .hasSize(1);
+
+    assertThat(actual.get(0).getMessage()) //
+        .isEqualTo("Must have at least one statement.");
+    assertThat(actual.get(0).getReporter()) //
+        .isEqualTo("PHP");
+  }
 }
diff --git a/src/test/resources/checkstyle/checkstyle-no-source.xml b/src/test/resources/checkstyle/checkstyle-no-source.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.9">
+<file name="nosource.php">
+<error line="11" column="33" severity="info" message="Must have at least one statement."/>
+</file>
+</checkstyle>