check_name and engine_name in CodeClimate #112

tomasbjerre · Oct 4, 2020 · c84cd59 · c84cd59
1 parent 62d32f8
commit c84cd59
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/main/java/se/bjurr/violations/lib/model/codeclimate/CodeClimateTransformer.java b/src/main/java/se/bjurr/violations/lib/model/codeclimate/CodeClimateTransformer.java
@@ -26,7 +26,7 @@ private static CodeClimate toCodeClimate(final Violation v) {
     final CodeClimateLines lines = new CodeClimateLines(v.getStartLine());
     final CodeClimateLocation location = new CodeClimateLocation(v.getFile(), lines, null);
     final CodeClimateSeverity severity = toSeverity(v.getSeverity());
-    final String check_name = v.getRule() == null ? v.getReporter() : v.getRule();
+    final String check_name = v.getRule().isEmpty() ? v.getReporter() : v.getRule();
     final String engine_name = v.getReporter();
     final List<CodeClimateCategory> categories = new ArrayList<CodeClimateCategory>();
     categories.add(CodeClimateCategory.BUGRISK);

diff --git a/src/test/java/se/bjurr/violations/lib/model/codeclimate/CodeClimateTransformerTest.java b/src/test/java/se/bjurr/violations/lib/model/codeclimate/CodeClimateTransformerTest.java
@@ -21,7 +21,8 @@ public void testThatViolationsCanBeTransformed() {
     final String fingerprint = "287f089bbb587fbb815c35558f2053564c792d5add0f19cfd38fc6ffea3454fc";
     final Integer begin = 123;
     final String path = "/whatever/path.c";
-    final Violation violation =
+    final Set<Violation> violationSet = new TreeSet<Violation>();
+    final Violation violation1 =
         violationBuilder() //
             .setFile(path) //
             .setMessage(description) //
@@ -30,17 +31,26 @@ public void testThatViolationsCanBeTransformed() {
             .setSeverity(SEVERITY.ERROR) //
             .setStartLine(begin) //
             .build();
-    final Set<Violation> violationSet = new TreeSet<Violation>();
-    violationSet.add(violation);
+    violationSet.add(violation1);
+    final Violation violation2 =
+        violationBuilder() //
+            .setFile(path) //
+            .setMessage(description) //
+            .setParser(Parser.ANDROIDLINT) //
+            .setRule(null) //
+            .setSeverity(SEVERITY.INFO) //
+            .setStartLine(begin) //
+            .build();
+    violationSet.add(violation2);
     final List<CodeClimate> transformed = CodeClimateTransformer.fromViolations(violationSet);
     final CodeClimateLines lines = new CodeClimateLines(begin);
     final CodeClimateLocation location = new CodeClimateLocation(path, lines, null);
     final CodeClimateSeverity severity = CodeClimateSeverity.critical;
     final String check_name = "Cyclomatic complexity";
     final String engine_name = Parser.CHECKSTYLE.name();
     final List<CodeClimateCategory> categories = Arrays.asList(CodeClimateCategory.BUGRISK);
-    assertThat(transformed).hasSize(1);
-    assertThat(this.toJson(transformed.get(0))) //
+    assertThat(transformed).hasSize(2);
+    assertThat(this.toJson(transformed.get(1))) //
         .isEqualTo(
             this.toJson(
                 new CodeClimate(