SONARJAVA-1212 Migrates test to JavaCheckVerifier

Author: Wohops

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

@@ -5,8 +5,8 @@
 class A {
   void myMethod(String algorithm) {
     MessageDigest md = null;
-    md = MessageDigest.getInstance("MD5"); // Noncompliant
-    md = MessageDigest.getInstance("SHA-1"); // Noncompliant
+    md = MessageDigest.getInstance("MD5"); // Noncompliant {{Use a stronger encryption algorithm than MD5.}}
+    md = MessageDigest.getInstance("SHA-1"); // Noncompliant {{Use a stronger encryption algorithm than SHA-1.}}
     md = MessageDigest.getInstance("SHA-256");
     md = org.apache.commons.codec.digest.DigestUtils.getDigest("MD5"); // Noncompliant
     md = DigestUtils.getDigest("SHA-1"); // Noncompliant
@@ -25,9 +25,9 @@ void myMethod(String algorithm) {
     DigestUtils.sha256Hex("");
     md = MessageDigest.getInstance(algorithm);
     md = DigestUtils.getDigest(algorithm);
-    md5Hex("");
-    com.google.common.hash.Hashing.md5();
-    com.google.common.hash.Hashing.sha1();
+    md5Hex(""); // Noncompliant
+    com.google.common.hash.Hashing.md5(); // Noncompliant
+    com.google.common.hash.Hashing.sha1(); // Noncompliant
     com.google.common.hash.Hashing.sha256();
   }
 

java-checks/src/test/java/org/sonar/java/checks/DeprecatedHashAlgorithmCheckTest.java

@@ -19,42 +19,14 @@
  */
 package org.sonar.java.checks;
 
-import com.google.common.collect.ImmutableList;
-import org.junit.Rule;
 import org.junit.Test;
-import org.sonar.java.ast.JavaAstScanner;
-import org.sonar.java.model.VisitorsBridge;
-import org.sonar.squidbridge.api.SourceFile;
-import org.sonar.squidbridge.checks.CheckMessagesVerifierRule;
-
-import java.io.File;
+import org.sonar.java.checks.verifier.JavaCheckVerifier;
 
 public class DeprecatedHashAlgorithmCheckTest {
 
-  @Rule
-  public CheckMessagesVerifierRule checkMessagesVerifier = new CheckMessagesVerifierRule();
-
   @Test
   public void test() {
-    SourceFile file = JavaAstScanner.scanSingleFile(new File("src/test/files/checks/DeprecatedHashAlgorithmCheck.java"),
-      new VisitorsBridge(new DeprecatedHashAlgorithmCheck(), ImmutableList.of(new File("target/test-classes"))));
-    checkMessagesVerifier.verify(file.getCheckMessages())
-      .next().atLine(8).withMessage("Use a stronger encryption algorithm than MD5.")
-      .next().atLine(9).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(11).withMessage("Use a stronger encryption algorithm than MD5.")
-      .next().atLine(12).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(14).withMessage("Use a stronger encryption algorithm than MD5.")
-      .next().atLine(15).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(16).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(18).withMessage("Use a stronger encryption algorithm than MD5.")
-      .next().atLine(19).withMessage("Use a stronger encryption algorithm than MD5.")
-      .next().atLine(20).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(21).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(22).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(23).withMessage("Use a stronger encryption algorithm than SHA-1.")
-      .next().atLine(28).withMessage("Use a stronger encryption algorithm than MD5.")
-      .next().atLine(29).withMessage("Use a stronger encryption algorithm than MD5.")
-      .next().atLine(30).withMessage("Use a stronger encryption algorithm than SHA-1.");
+    JavaCheckVerifier.verify("src/test/files/checks/DeprecatedHashAlgorithmCheck.java", new DeprecatedHashAlgorithmCheck());
   }
 
 }