SONARJAVA-1285 Drop multiple issues per line support

Author: mpaladin

java-checks-testkit/src/main/java/org/sonar/java/checks/verifier/JavaCheckVerifier.java

@@ -181,10 +181,8 @@ private void collectExpectedIssues(String comment, int line) {
         final int endIndex = cleanedComment.indexOf(' ');
         if (endIndex == -1) {
           lineAdjustment = Integer.parseInt(cleanedComment.substring(2));
-          cleanedComment = "";
         } else {
           lineAdjustment = Integer.parseInt(cleanedComment.substring(2, endIndex));
-          cleanedComment = cleanedComment.substring(endIndex + 1).trim();
         }
         if (firstChar == '+') {
           expectedLine += lineAdjustment;
@@ -194,11 +192,7 @@ private void collectExpectedIssues(String comment, int line) {
           throw Fail.fail("Use only '@+N' or '@-N' to shifts messages.");
         }
       }
-      cleanedComment = StringUtils.trim(cleanedComment);
-      int times = StringUtils.isEmpty(cleanedComment) ? 1 : Integer.parseInt(cleanedComment);
-      for (int i = 0; i < times; i++) {
-        expected.put(expectedLine, expectedMessage);
-      }
+      expected.put(expectedLine, expectedMessage);
     }
   }
 

java-checks-testkit/src/test/files/JavaCheckVerifier.java

@@ -6,8 +6,8 @@ void foo() { // test method
     // Noncompliant@+1 {{message2}}
     int j;
     int k;
-    // Noncompliant@-1 2 {{message3}}
-    int l; // Noncompliant 2 {{message4}}
+    // Noncompliant@-1 {{message3}}
+    int l; // Noncompliant {{message4}}
     int m; // Noncompliant
   }
 }

java-checks-testkit/src/test/java/org/sonar/java/checks/verifier/JavaCheckVerifierTest.java

@@ -183,8 +183,6 @@ private FakeVisitor withDefaultIssues() {
         .withIssue(3, "message1")
         .withIssue(7, "message2")
         .withIssue(8, "message3")
-        .withIssue(8, "message3")
-        .withIssue(10, "message4")
         .withIssue(10, "message4")
         .withIssue(11, "no message");
     }

java-checks/src/test/files/JavaCheckVerifier.java

@@ -275,7 +275,8 @@ public void testDoWhileLoop(boolean condition) {
 
   public void testForLoop() {
     Object object = null;
-    for(; object.hashCode() != 0; object.hashCode()) { // Noncompliant 2 {{NullPointerException might be thrown as 'object' is nullable here}}
+    for(; object.hashCode() != 0; // Noncompliant {{NullPointerException might be thrown as 'object' is nullable here}}
+        object.hashCode()) { // Noncompliant {{NullPointerException might be thrown as 'object' is nullable here}}
       object.hashCode(); // False negative
       object = null;
     }

java-checks/src/test/files/checks/NullPointerCheck.java

@@ -42,7 +42,8 @@ void foo(){
     String.format("%08d%n", 1);
     GregorianCalendar gc;
     String.format("Duke's Birthday year is %tH", gc);
-    String.format("Duke's Birthday year is %t", loc);  // Noncompliant 2
+    // Noncompliant@+1
+    String.format("Duke's Birthday year is %t", loc);  // Noncompliant
 
     pr.format("string without arguments"); // Noncompliant  {{String contains no format specifiers.}}
     pr.format(loc, "string without arguments"); // Noncompliant  {{String contains no format specifiers.}}
@@ -74,4 +75,4 @@ void foo(){
     String.format("%0$s", "tmp"); // Noncompliant {{Arguments are numbered starting from 1.}}
 
   }
-}
+}

java-checks/src/test/files/checks/PrintfCheck.java

@@ -34,7 +34,8 @@ public void attempt(String name, int size, boolean isNice) { // Compliant
 }
 
 abstract class B {
-  public int foo(int a, boolean b, boolean c) { // Noncompliant 2
+  // Noncompliant@+1
+  public int foo(int a, boolean b, boolean c) { // Noncompliant
     if (b) {
     } else {
     }
@@ -76,4 +77,4 @@ private int hal(int a, boolean b) { // Compliant - rule only check for public me
   public int lap(int a, boolean b) { // Compliant
     return b && false ? a+1 : a-1;
   }
-}
+}

java-checks/src/test/files/checks/SelectorMethodArgumentCheck.java

@@ -157,9 +157,10 @@ class FooPackage { // Compliant - non public
 /** Documented.
  */
 public class Foo { // Compliant
+  // Noncompliant@+3
   /** foo.
    */
-  public int foo(int a, int b, int c) { // Noncompliant 2
+  public int foo(int a, int b, int c) { // Noncompliant
     return 0;
   }
 
@@ -291,4 +292,4 @@ public int compare(String o1, String o2) {
       }
     };
   }
-}
+}

java-checks/src/test/files/checks/UndocumentedApi.java

@@ -22,7 +22,8 @@ void foo() {
     tab[(1+2)]; // Noncompliant
     tab[(1+2)/2];
     A a = new A((1/3)); // Noncompliant
-    return (((x & 0x0000FFFF)) | y); // Noncompliant 2
+    return (( // Noncompliant
+      (x & 0x0000FFFF)) | y); // Noncompliant
     getContentSpec(((int[])contentSpec.value)[0], contentSpec);
 
     this.a = b; // Compliant

java-checks/src/test/files/checks/UselessParenthesesCheck.java

@@ -19,19 +19,13 @@
  */
 package org.sonar.java.checks;
 
-import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.java.checks.verifier.JavaCheckVerifier;
-import org.sonar.squidbridge.checks.CheckMessagesVerifierRule;
 
 public class PrintfCheckTest {
 
-  @Rule
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
-
   @Test
   public void detected() {
     JavaCheckVerifier.verify("src/test/files/checks/PrintfCheck.java", new PrintfCheck());
-    ;
   }
 }