[NO JIRA] Improve test code quality (#4824)

Fix quality gate after more rules enabled on test code

Author: leonardo-pilastri-sonarsource

its/plugin/tests/src/test/java/com/sonar/it/java/suite/JavaTest.java

@@ -32,6 +32,7 @@
 import org.junit.rules.TemporaryFolder;
 import org.sonarqube.ws.Components;
 import org.sonarqube.ws.Issues.Issue;
+
 import static com.sonar.it.java.suite.JavaTestSuite.getComponent;
 import static com.sonar.it.java.suite.JavaTestSuite.getMeasureAsInteger;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -152,12 +153,12 @@ public void support_change_of_extension_property() {
 
   @Test
   public void should_execute_rule_on_test() throws Exception {
-    MavenLocation junit_4_11 = MavenLocation.of("junit", "junit", "4.11");
-    orchestrator.getConfiguration().locators().copyToDirectory(junit_4_11, tmp.getRoot());
+    MavenLocation junit411 = MavenLocation.of("junit", "junit", "4.11");
+    orchestrator.getConfiguration().locators().copyToDirectory(junit411, tmp.getRoot());
     MavenBuild build = MavenBuild.create()
       .setPom(TestUtils.projectPom("java-inner-classes"))
       .setProperty("sonar.java.test.binaries", "target/test-classes")
-      .setProperty("sonar.java.test.libraries", new File(tmp.getRoot(), junit_4_11.getFilename()).getAbsolutePath())
+      .setProperty("sonar.java.test.libraries", new File(tmp.getRoot(), junit411.getFilename()).getAbsolutePath())
       .setCleanPackageSonarGoals();
     TestUtils.provisionProject(orchestrator, "org.sonarsource.it.projects:java-inner-classes", "java-inner-classes", "java", "ignored-test-check");
     orchestrator.executeBuild(build);

its/plugin/tests/src/test/java/com/sonar/it/java/suite/Struts139Test.java

@@ -84,9 +84,9 @@ public void unit_test_metrics() {
   public void complexity_metrics() {
     assertThat(getMeasureAsInteger(PROJECT_STRUTS, "complexity")).isEqualTo(5589);
 
-    int expected_statements = 12103;
-    expected_statements += 3; // empty statements in type declaration or member of classes in struts-1.3.9
-    assertThat(getMeasureAsInteger(PROJECT_STRUTS, "statements")).isEqualTo(expected_statements);
+    int expectedStatements = 12103;
+    expectedStatements += 3; // empty statements in type declaration or member of classes in struts-1.3.9
+    assertThat(getMeasureAsInteger(PROJECT_STRUTS, "statements")).isEqualTo(expectedStatements);
   }
 
   private static String componentKey(String path, String file) {

its/plugin/tests/src/test/java/com/sonar/it/java/suite/TestUtils.java

@@ -90,8 +90,8 @@ static WsClient newAdminWsClient(Orchestrator orchestrator) {
       .build());
   }
 
-  public static void provisionProject(Orchestrator ORCHESTRATOR, String projectKey, String projectName, String languageKey, String profileName) {
-    Server server = ORCHESTRATOR.getServer();
+  public static void provisionProject(Orchestrator orchestrator, String projectKey, String projectName, String languageKey, String profileName) {
+    Server server = orchestrator.getServer();
     server.provisionProject(projectKey, projectName);
     server.associateProjectToQualityProfile(projectKey, languageKey, profileName);
   }

its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java

@@ -83,7 +83,7 @@ public class JavaRulingTest {
   );
 
   @ClassRule
-  public static TemporaryFolder TMP_DUMP_OLD_FOLDER = new TemporaryFolder();
+  public static TemporaryFolder tmpDumpOldFolder = new TemporaryFolder();
 
   private static Path effectiveDumpOldFolder;
 
@@ -159,7 +159,7 @@ private static void prepareDumpOldFolder() throws Exception {
     if (SUBSET_OF_ENABLED_RULES.isEmpty()) {
       effectiveDumpOldFolder = allRulesFolder.toAbsolutePath();
     } else {
-      effectiveDumpOldFolder = TMP_DUMP_OLD_FOLDER.getRoot().toPath().toAbsolutePath();
+      effectiveDumpOldFolder = tmpDumpOldFolder.getRoot().toPath().toAbsolutePath();
       Files.list(allRulesFolder)
         .filter(p -> p.toFile().isDirectory())
         .forEach(srcProjectDir -> copyDumpSubset(srcProjectDir, effectiveDumpOldFolder.resolve(srcProjectDir.getFileName())));

java-checks-testkit/src/test/java/org/sonar/java/checks/verifier/internal/CheckVerifierTestUtils.java

@@ -68,7 +68,7 @@ public void scanFile(JavaFileScannerContext context) {
   }
 
   @Rule(key = "NoEffectCheck")
-  protected final static class NoEffectCheck implements JavaFileScanner {
+  protected static final class NoEffectCheck implements JavaFileScanner {
 
     @Override
     public void scanFile(JavaFileScannerContext context) {

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

@@ -23,7 +23,7 @@
 import org.sonar.java.checks.verifier.CheckVerifier;
 
 import static org.sonar.java.checks.verifier.TestUtils.mainCodeSourcesPath;
-import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;;
+import static org.sonar.java.checks.verifier.TestUtils.nonCompilingTestSourcesPath;
 
 class ForLoopIncrementAndUpdateCheckTest {
 

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

@@ -26,12 +26,12 @@
 
 class SubClassStaticReferenceCheckTest {
 
-  private static final String filename = mainCodeSourcesPath("checks/SubClassStaticReferenceCheckSample.java");
+  private static final String FILENAME = mainCodeSourcesPath("checks/SubClassStaticReferenceCheckSample.java");
 
   @Test
   void detected() {
     CheckVerifier.newVerifier()
-      .onFile(filename)
+      .onFile(FILENAME)
       .withCheck(new SubClassStaticReferenceCheck())
       .verifyIssues();
   }

java-checks/src/test/java/org/sonar/java/checks/design/BrainMethodCheckTest.java

@@ -26,14 +26,14 @@
 
 class BrainMethodCheckTest {
 
-  private static final String highComplexityFilePath = mainCodeSourcesPath("checks/BrainMethodCheckSample.java");
-  private static final String lowComplexityFilePath = mainCodeSourcesPath("checks/BrainMethodCheckLowerThresholds.java");
-  private static final String subsetFilePath = mainCodeSourcesPath("checks/BrainMethodCheckSubsetOfIssues.java");
+  private static final String HIGH_COMPLEXITY_FILE_PATH = mainCodeSourcesPath("checks/BrainMethodCheckSample.java");
+  private static final String LOW_COMPLEXITY_FILE_PATH = mainCodeSourcesPath("checks/BrainMethodCheckLowerThresholds.java");
+  private static final String SUBSET_FILE_PATH = mainCodeSourcesPath("checks/BrainMethodCheckSubsetOfIssues.java");
 
   @Test
   void testHighComplexityFileWithDefaultThresholds() {
     CheckVerifier.newVerifier()
-      .onFile(highComplexityFilePath)
+      .onFile(HIGH_COMPLEXITY_FILE_PATH)
       .withChecks(new BrainMethodCheck())
       .verifyIssues();
   }
@@ -48,15 +48,15 @@ void testHighComplexityFileWithHigherThresholds() {
     check.cyclomaticThreshold = 45;
 
     CheckVerifier.newVerifier()
-      .onFile(highComplexityFilePath)
+      .onFile(HIGH_COMPLEXITY_FILE_PATH)
       .withChecks(check)
       .verifyNoIssues();
   }
 
   @Test
   void testLowComplexityFileWithDefaultThresholds() {
     CheckVerifier.newVerifier()
-      .onFile(lowComplexityFilePath)
+      .onFile(LOW_COMPLEXITY_FILE_PATH)
       .withChecks(new BrainMethodCheck())
       .verifyNoIssues();
   }
@@ -70,7 +70,7 @@ void testLowComplexityFileWithLowerThresholds() {
     check.cyclomaticThreshold = 5;
 
     CheckVerifier.newVerifier()
-      .onFile(lowComplexityFilePath)
+      .onFile(LOW_COMPLEXITY_FILE_PATH)
       .withChecks(check)
       .verifyIssues();
   }
@@ -87,7 +87,7 @@ void testSubsetOfIssuesWithLowerThresholds() {
     check.numberOfIssuesToReport = 1;
 
     CheckVerifier.newVerifier()
-      .onFile(subsetFilePath)
+      .onFile(SUBSET_FILE_PATH)
       .withChecks(check)
       .verifyIssues();
   }

java-checks/src/test/java/org/sonar/java/checks/helpers/HashCacheTestHelper.java

@@ -19,17 +19,16 @@
  */
 package org.sonar.java.checks.helpers;
 
-import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.batch.sensor.cache.ReadCache;
-import org.sonar.java.caching.FileHashingUtils;
-import org.sonar.java.checks.verifier.internal.InternalInputFile;
-import org.sonar.java.checks.verifier.internal.InternalReadCache;
-
 import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Collection;
+import org.sonar.api.batch.fs.InputFile;
+import org.sonar.api.batch.sensor.cache.ReadCache;
+import org.sonar.java.caching.FileHashingUtils;
+import org.sonar.java.checks.verifier.internal.InternalInputFile;
+import org.sonar.java.checks.verifier.internal.InternalReadCache;
 
 public class HashCacheTestHelper {
 
@@ -49,8 +48,7 @@ public static String contentHashKey(InputFile inputFile) {
   public static ReadCache internalReadCacheFromFile(String path) throws NoSuchAlgorithmException, IOException {
     InputFile cachedFile = inputFileFromPath(path);
     byte[] cachedHash = FileHashingUtils.inputFileContentHash(cachedFile);
-    InternalReadCache localReadCache = new InternalReadCache().put(contentHashKey(cachedFile), cachedHash);
-    return localReadCache;
+    return new InternalReadCache().put(contentHashKey(cachedFile), cachedHash);
   }
 
   public static ReadCache internalReadCacheFromFiles(Collection<String> paths) throws NoSuchAlgorithmException, IOException {

java-checks/src/test/java/org/sonar/java/checks/tests/AssertionTypesCheckTest.java

@@ -114,11 +114,11 @@ void arguments_of_unknown_method() {
 
   @Test
   void wrapper_type_with_invalid_primitive() {
-    Type invalid_primitive = mock(Type.class);
-    when(invalid_primitive.isPrimitive()).thenReturn(true);
-    when(invalid_primitive.fullyQualifiedName()).thenReturn("invalid_name");
-    Type type = AssertionTypesCheck.wrapperType(invalid_primitive);
-    assertThat(type).isSameAs(invalid_primitive);
+    Type invalidPrimitive = mock(Type.class);
+    when(invalidPrimitive.isPrimitive()).thenReturn(true);
+    when(invalidPrimitive.fullyQualifiedName()).thenReturn("invalid_name");
+    Type type = AssertionTypesCheck.wrapperType(invalidPrimitive);
+    assertThat(type).isSameAs(invalidPrimitive);
   }
 
 }