From c84cd5922cfa3cc3add6b1248a88354095b41160 Mon Sep 17 00:00:00 2001 From: Tomas Bjerre Date: Sun, 4 Oct 2020 12:19:52 +0200 Subject: [PATCH] check_name and engine_name in CodeClimate #112 --- .../codeclimate/CodeClimateTransformer.java | 2 +- .../CodeClimateTransformerTest.java | 20 ++++++++++++++----- 2 files changed, 16 insertions(+), 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 index 18f61d38..2b995355 100644 --- 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 categories = new ArrayList(); 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 index 3530116a..5db5d3de 100644 --- 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 violationSet = new TreeSet(); + final Violation violation1 = violationBuilder() // .setFile(path) // .setMessage(description) // @@ -30,8 +31,17 @@ public void testThatViolationsCanBeTransformed() { .setSeverity(SEVERITY.ERROR) // .setStartLine(begin) // .build(); - final Set violationSet = new TreeSet(); - 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 transformed = CodeClimateTransformer.fromViolations(violationSet); final CodeClimateLines lines = new CodeClimateLines(begin); final CodeClimateLocation location = new CodeClimateLocation(path, lines, null); @@ -39,8 +49,8 @@ public void testThatViolationsCanBeTransformed() { final String check_name = "Cyclomatic complexity"; final String engine_name = Parser.CHECKSTYLE.name(); final List 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(