SONAR-3895 export violations with no line

2 files changed, 27 insertions, 7 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/local/DryRunExporter.java b/sonar-batch/src/main/java/org/sonar/batch/local/DryRunExporter.java
index d146d21379e..432228ef477 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/local/DryRunExporter.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/local/DryRunExporter.java
@@ -23,6 +23,7 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.google.common.io.Closeables;
 import com.google.common.io.Files;
 import com.google.gson.Gson;
@@ -95,12 +96,15 @@ public class DryRunExporter implements BatchComponent {
       for (Resource resource : resources) {
         List<Map<String, Object>> resourceViolations = Lists.newArrayList();
         for (Violation violation : getViolations(resource)) {
-          resourceViolations.add(ImmutableMap.<String, Object> of(
-              "line", violation.getLineId(),
-              "message", violation.getMessage(),
-              "severity", violation.getSeverity().name(),
-              "rule_key", violation.getRule().getKey(),
-              "rule_name", violation.getRule().getName()));
+          Map<String, Object> json = Maps.newLinkedHashMap();
+          if (null != violation.getLineId()) {
+            json.put("line", violation.getLineId());
+          }
+          json.put("message", violation.getMessage());
+          json.put("severity", violation.getSeverity().name());
+          json.put("rule_key", violation.getRule().getKey());
+          json.put("rule_name", violation.getRule().getName());
+          resourceViolations.add(json);
         }
 
         Map<String, Object> obj = ImmutableMap.of(
diff --git a/sonar-batch/src/test/java/org/sonar/batch/local/DryRunExporterTest.java b/sonar-batch/src/test/java/org/sonar/batch/local/DryRunExporterTest.java
index e6dfca20b37..d2dc09d5b82 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/local/DryRunExporterTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/local/DryRunExporterTest.java
@@ -76,6 +76,22 @@ public class DryRunExporterTest {
     String json = dryRunExporter.getResultsAsJson(ImmutableSet.of(resource));
 
     assertThat(json).isEqualTo(
-        "[{\"resource\":\"KEY\",\"violations\":[{\"line\":1,\"message\":\"VIOLATION\",\"severity\":\"INFO\",\"rule_key\":\"RULE_KEY\",\"rule_name\":\"RULE_NAME\"}]}]");
+      "[{\"resource\":\"KEY\",\"violations\":[{\"line\":1,\"message\":\"VIOLATION\",\"severity\":\"INFO\",\"rule_key\":\"RULE_KEY\",\"rule_name\":\"RULE_NAME\"}]}]");
+  }
+
+  @Test
+  public void should_export_violation_with_no_line() {
+    when(dryRun.isEnabled()).thenReturn(true);
+    when(violation.getResource()).thenReturn(resource);
+    when(violation.getLineId()).thenReturn(null);
+    when(violation.getMessage()).thenReturn("VIOLATION");
+    when(violation.getRule()).thenReturn(Rule.create("pmd", "RULE_KEY").setName("RULE_NAME"));
+    when(violation.getSeverity()).thenReturn(RulePriority.INFO);
+    doReturn(Arrays.asList(violation)).when(dryRunExporter).getViolations(resource);
+
+    String json = dryRunExporter.getResultsAsJson(ImmutableSet.of(resource));
+
+    assertThat(json).isEqualTo(
+      "[{\"resource\":\"KEY\",\"violations\":[{\"message\":\"VIOLATION\",\"severity\":\"INFO\",\"rule_key\":\"RULE_KEY\",\"rule_name\":\"RULE_NAME\"}]}]");
   }
 }