Fix quality flaw: fix issues on test codes from latest rules

Wohops · Wohops · commit c02263e8698d · 2020-06-15T08:14:52.000+02:00
diff --git a/java-checks-testkit/src/test/java/org/sonar/java/checks/verifier/JavaCheckVerifierTest.java b/java-checks-testkit/src/test/java/org/sonar/java/checks/verifier/JavaCheckVerifierTest.java
@@ -128,8 +128,9 @@ void verify_issue_on_project() {
 
   @Test
   void verify_issue_on_file_incorrect() {
+    FakeVisitor visitor = new FakeVisitor().withDefaultIssues();
     try {
-      JavaCheckVerifier.verifyIssueOnFile(FILENAME_ISSUES, "messageOnFile", new FakeVisitor().withDefaultIssues());
+      JavaCheckVerifier.verifyIssueOnFile(FILENAME_ISSUES, "messageOnFile", visitor);
       Fail.fail("Should have failed");
     } catch (AssertionError e) {
       assertThat(e).hasMessage("A single issue is expected on the file, but 10 issues have been raised");
@@ -264,8 +265,9 @@ void test_with_no_semantic() throws Exception {
     IssuableSubscriptionVisitor noIssueVisitor = new FakeVisitor();
     JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_ISSUES, noIssueVisitor);
     JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_NO_ISSUE, noIssueVisitor);
+    FakeVisitor visitor = new FakeVisitor().withDefaultIssues();
     try {
-      JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_ISSUES, new FakeVisitor().withDefaultIssues());
+      JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_ISSUES, visitor);
       Fail.fail("Should have failed");
     } catch (AssertionError e) {
       assertThat(e.getMessage()).contains("No issues expected but got 10 issue(s):");
@@ -278,8 +280,9 @@ void test_with_no_semantic_and_java_version() throws Exception {
     IssuableSubscriptionVisitor noIssueVisitor = new FakeVisitor();
     JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_ISSUES, noIssueVisitor, java_8);
     JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_NO_ISSUE, noIssueVisitor, java_8);
+    FakeVisitor visitor = new FakeVisitor().withDefaultIssues();
     try {
-      JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_ISSUES, new FakeVisitor().withDefaultIssues(), java_8);
+      JavaCheckVerifier.verifyNoIssueWithoutSemantic(FILENAME_ISSUES, visitor, java_8);
       Fail.fail("Should have failed");
     } catch (AssertionError e) {
       assertThat(e.getMessage()).contains("No issues expected but got 10 issue(s):");
diff --git a/java-checks-testkit/src/test/java/org/sonar/java/checks/verifier/MultipleFilesJavaCheckVerifierTest.java b/java-checks-testkit/src/test/java/org/sonar/java/checks/verifier/MultipleFilesJavaCheckVerifierTest.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import org.assertj.core.api.Fail;
 import org.junit.jupiter.api.Test;
+import org.sonar.java.checks.verifier.JavaCheckVerifierTest.FakeVisitor;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
 import org.sonar.plugins.java.api.tree.Tree;
 
@@ -44,8 +45,9 @@ public List<Tree.Kind> nodesToVisit() {
   @Test
   void verify_unexpected_issue() {
     IssuableSubscriptionVisitor visitor = new JavaCheckVerifierTest.FakeVisitor().withDefaultIssues().withIssue(4, "extra message");
+    List<String> files = Arrays.asList(FILENAME_ISSUES_FIRST, FILENAME_NO_ISSUE);
     try {
-      MultipleFilesJavaCheckVerifier.verify(Arrays.asList(FILENAME_ISSUES_FIRST, FILENAME_NO_ISSUE), visitor);
+      MultipleFilesJavaCheckVerifier.verify(files, visitor);
       Fail.fail("Should have failed");
     } catch (AssertionError e) {
       assertThat(e).hasMessage("Unexpected at [4]");
@@ -55,8 +57,9 @@ void verify_unexpected_issue() {
   @Test
   void verify_combined_missing_expected_and_unexpected_issues() {
     IssuableSubscriptionVisitor visitor = new JavaCheckVerifierTest.FakeVisitor().withDefaultIssues().withIssue(4, "extra message").withoutIssue(1);
+    List<String> files = Arrays.asList(FILENAME_ISSUES_FIRST, FILENAME_NO_ISSUE);
     try {
-      MultipleFilesJavaCheckVerifier.verify(Arrays.asList(FILENAME_ISSUES_FIRST, FILENAME_NO_ISSUE), visitor);
+      MultipleFilesJavaCheckVerifier.verify(files, visitor);
       Fail.fail("Should have failed");
     } catch (AssertionError e) {
       assertThat(e).hasMessage("Expected at [1], Unexpected at [4]");
@@ -71,9 +74,10 @@ void verify_issues_in_multiple_files() {
 
   @Test
   void test_issues_with_no_semantic() {
+    List<String> files = Arrays.asList(FILENAME_ISSUES_FIRST, FILENAME_NO_ISSUE);
+    FakeVisitor visitor = new JavaCheckVerifierTest.FakeVisitor().withDefaultIssues();
     try {
-      MultipleFilesJavaCheckVerifier.verifyNoIssueWithoutSemantic(Arrays.asList(FILENAME_ISSUES_FIRST, FILENAME_NO_ISSUE),
-        new JavaCheckVerifierTest.FakeVisitor().withDefaultIssues());
+      MultipleFilesJavaCheckVerifier.verifyNoIssueWithoutSemantic(files, visitor);
       Fail.fail("Should have failed");
     } catch (AssertionError e) {
       assertThat(e.getMessage()).contains("No issues expected but got 10 issue(s):");
diff --git a/java-checks/src/test/java/org/sonar/java/checks/PackageInfoCheckTest.java b/java-checks/src/test/java/org/sonar/java/checks/PackageInfoCheckTest.java
@@ -52,7 +52,7 @@ void no_package_info() {
 
     Set<File> set = check.directoriesWithoutPackageFile;
     assertThat(set).hasSize(1);
-    assertThat(set.iterator().next().getName()).isEqualTo("nopackageinfo");
+    assertThat(set.iterator().next()).hasName("nopackageinfo");
 
     // only one issue per package
     JavaCheckVerifier.newVerifier()
diff --git a/java-frontend/src/test/java/org/sonar/java/JavaClasspathTest.java b/java-frontend/src/test/java/org/sonar/java/JavaClasspathTest.java
@@ -167,7 +167,7 @@ void libraries_should_accept_path_ending_with_wildcard() {
     assertThat(javaClasspath.getElements().get(2)).exists();
     assertThat(javaClasspath.getElements()).extracting("name").contains("hello.jar", "world.jar", "target");
   }
-  
+
   @Test
   void libraries_should_keep_order() {
     settings.setProperty(JavaClasspathProperties.SONAR_JAVA_LIBRARIES, "lib/world.jar,lib/hello.jar,lib/target/classes/*");
@@ -224,8 +224,9 @@ void libraries_should_accept_path_ending_with_wildcard_jar() {
     javaClasspath = createJavaClasspath();
     assertThat(javaClasspath.getElements()).hasSize(1);
     File jar = javaClasspath.getElements().get(0);
-    assertThat(jar).exists();
-    assertThat(jar.getName()).isEqualTo("hello.jar");
+    assertThat(jar)
+      .exists()
+      .hasName("hello.jar");
 
     settings.setProperty(JavaClasspathProperties.SONAR_JAVA_LIBRARIES, "lib/*.jar");
     javaClasspath = createJavaClasspath();
diff --git a/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java b/java-frontend/src/test/java/org/sonar/java/ast/JavaAstScannerTest.java
@@ -214,8 +214,9 @@ public void init(MethodTree methodTree, CFG cfg) {
   void should_propagate_SOError() {
     JavaAstScanner scanner = new JavaAstScanner(null);
     scanner.setVisitorBridge(new VisitorsBridge(new CheckThrowingSOError()));
+    List<InputFile> files = Collections.singletonList(TestUtils.inputFile("src/test/resources/AstScannerNoParseError.txt"));
     try {
-      scanner.scan(Collections.singletonList(TestUtils.inputFile("src/test/resources/AstScannerNoParseError.txt")));
+      scanner.scan(files);
       fail("Should have triggered a StackOverflowError and not reach this point.");
     } catch (Error e) {
       assertThat(e).isInstanceOf(StackOverflowError.class);
diff --git a/java-frontend/src/test/java/org/sonar/java/se/xproc/HappyPathYieldTest.java b/java-frontend/src/test/java/org/sonar/java/se/xproc/HappyPathYieldTest.java
@@ -62,10 +62,10 @@ void test_equals() {
     yield.setResult(-1, NOT_NULL_CONSTRAINT);
     otherYield = new HappyPathYield(mb);
     otherYield.setResult(-1, NOT_NULL_CONSTRAINT);
-    assertThat(yield).isEqualTo(otherYield);
-
-    // same arity and parameters but exceptional yield
-    assertThat(yield).isNotEqualTo(new ExceptionalYield(mb));
+    assertThat(yield)
+      .isEqualTo(otherYield)
+      // same arity and parameters but exceptional yield
+      .isNotEqualTo(new ExceptionalYield(mb));
   }
 
   @Test
diff --git a/java-frontend/src/test/java/org/sonar/java/se/xproc/MethodYieldTest.java b/java-frontend/src/test/java/org/sonar/java/se/xproc/MethodYieldTest.java
@@ -147,29 +147,19 @@ void yields_are_not_generated_by_check() {
   void test_yield_equality() {
     MethodBehavior methodBehavior = mockMethodBehavior(1, false);
     MethodYield yield = newMethodYield(methodBehavior);
-    MethodYield otherYield;
-
-    assertThat(yield).isNotEqualTo(null);
-    assertThat(yield).isNotEqualTo(new Object());
-
-    // same instance
-    assertThat(yield).isEqualTo(yield);
-
-    // method behavior not taken into account
-    MethodYield myYield = newMethodYield(null);
-    assertThat(yield).isEqualTo(myYield);
-
-    // node not taken into account
-    otherYield = newMethodYield(mockNode(), methodBehavior);
-    assertThat(yield).isEqualTo(otherYield);
-
-    // same arity and constraints on parameters but exceptional path
-    otherYield = new ExceptionalYield(methodBehavior);
-    assertThat(yield).isNotEqualTo(otherYield);
-
-    // same arity and constraints on parameters but happy path path
-    otherYield = new HappyPathYield(methodBehavior);
-    assertThat(yield).isNotEqualTo(otherYield);
+    assertThat(yield)
+      .isNotEqualTo(null)
+      .isNotEqualTo(new Object())
+      // same instance
+      .isEqualTo(yield)
+      // method behavior not taken into account
+      .isEqualTo(newMethodYield(null))
+      // node not taken into account
+      .isEqualTo(newMethodYield(mockNode(), methodBehavior))
+      // same arity and constraints on parameters but exceptional path
+      .isNotEqualTo(new ExceptionalYield(methodBehavior))
+      // same arity and constraints on parameters but happy path path
+      .isNotEqualTo(new HappyPathYield(methodBehavior));
 
     ConstraintsByDomain nullConstraint = ConstraintsByDomain.empty().put(ObjectConstraint.NULL);
     MethodYield yield1 = newMethodYield(methodBehavior);
diff --git a/java-frontend/src/test/java/org/sonar/java/testing/ExpectationsTest.java b/java-frontend/src/test/java/org/sonar/java/testing/ExpectationsTest.java
@@ -27,7 +27,8 @@
 import java.util.stream.Collectors;
 import org.assertj.core.api.Fail;
 import org.junit.jupiter.api.Test;
-import org.sonar.java.testing.Expectations;
+import org.sonar.java.testing.Expectations.Parser;
+
 import static org.sonar.java.testing.Expectations.IssueAttribute.END_COLUMN;
 import static org.sonar.java.testing.Expectations.IssueAttribute.END_LINE;
 import static org.sonar.java.testing.Expectations.IssueAttribute.FLOWS;
@@ -72,8 +73,9 @@ void relative_end_line_attribute() {
 
   @Test
   void invalid_attribute_name() {
+    Parser parser = new Expectations().parser();
     try {
-      new Expectations().parser().parseIssue("// Noncompliant [[invalid]]", LINE);
+      parser.parseIssue("// Noncompliant [[invalid]]", LINE);
       Fail.fail("exception expected");
     } catch (AssertionError e) {
       assertThat(e).hasMessage("// Noncompliant attributes not valid: 'invalid'");
@@ -98,8 +100,9 @@ void issue_with_attributes_and_comment_switched() {
 
   @Test
   void end_line_attribute() {
+    Parser parser = new Expectations().parser();
     try {
-      new Expectations().parser().parseIssue("// Noncompliant [[endLine=-1]] {{message}}", 0);
+      parser.parseIssue("// Noncompliant [[endLine=-1]] {{message}}", 0);
       Fail.fail("exception expected");
     } catch (AssertionError e) {
       assertThat(e).hasMessage("endLine attribute should be relative to the line and must be +N with N integer");
diff --git a/java-frontend/src/test/java/org/sonar/plugins/java/api/CheckRegistrarTest.java b/java-frontend/src/test/java/org/sonar/plugins/java/api/CheckRegistrarTest.java
@@ -21,7 +21,8 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -30,8 +31,11 @@ class CheckRegistrarTest {
 
   @Test
   void repository_key_is_mandatory() throws Exception {
+    CheckRegistrar.RegistrarContext registrarContext = new CheckRegistrar.RegistrarContext();
+    List<Class<? extends JavaCheck>> checkClasses = Collections.emptyList();
+    List<Class<? extends JavaCheck>> testCheckClasses = Collections.emptyList();
     try {
-      new CheckRegistrar.RegistrarContext().registerClassesForRepository("  ", new ArrayList<>(), new ArrayList<>());
+      registrarContext.registerClassesForRepository("  ", checkClasses, testCheckClasses);
       fail("");
     } catch (IllegalArgumentException e) {
       assertThat(e).hasMessage("Please specify a valid repository key to register your custom rules");
diff --git a/java-frontend/src/test/java/org/sonar/plugins/java/api/IssuableSubscriptionVisitorTest.java b/java-frontend/src/test/java/org/sonar/plugins/java/api/IssuableSubscriptionVisitorTest.java
@@ -48,8 +48,10 @@ void test_custom_rules_report_issues() throws Exception {
 
   @Test
   void check_issuable_subscription_visitor_does_not_visit_tree_on_its_own() {
+    CompilationUnitTree tree = Mockito.mock(CompilationUnitTree.class);
+    CustomRule visitor = new CustomRule();
     try {
-      new CustomRule().scanTree(Mockito.mock(CompilationUnitTree.class));
+      visitor.scanTree(tree);
       fail("Analysis should have failed");
     } catch (UnsupportedOperationException e) {
       assertThat(e).hasMessage("IssuableSubscriptionVisitor should not drive visit of AST.");
diff --git a/java-jsp/src/test/java/org/sonar/java/jsp/JasperOptionsTest.java b/java-jsp/src/test/java/org/sonar/java/jsp/JasperOptionsTest.java
@@ -35,23 +35,23 @@
 import static org.mockito.Mockito.mock;
 
 class JasperOptionsTest {
-  
+
   @TempDir
   Path baseDir;
   @TempDir
   Path output;
-  
+
   @Test
   void test() throws Exception {
     JspCServletContext servletContext = new Jasper.ServletContext(baseDir.toUri().toURL(), this.getClass().getClassLoader());
     JasperOptions options = new JasperOptions(servletContext, output);
-    
+
     assertThat(options.getErrorOnUseBeanInvalidClassAttribute()).isFalse();
     assertThat(options.getKeepGenerated()).isTrue();
     assertThat(options.isPoolingEnabled()).isFalse();
     assertThat(options.getMappedFile()).isFalse();
     assertThat(options.getClassDebugInfo()).isFalse();
-    assertThat(options.getCheckInterval()).isEqualTo(0);
+    assertThat(options.getCheckInterval()).isZero();
     assertThat(options.getDevelopment()).isFalse();
     assertThat(options.getDisplaySourceFragment()).isFalse();
     assertThat(options.isSmapDumped()).isTrue();
@@ -71,12 +71,12 @@ void test() throws Exception {
     assertThat(options.isXpoweredBy()).isFalse();
     assertThat(options.getTagPluginManager()).isNotNull();
     assertThat(options.genStringAsCharArray()).isFalse();
-    assertThat(options.getModificationTestInterval()).isEqualTo(0);
+    assertThat(options.getModificationTestInterval()).isZero();
     assertThat(options.getRecompileOnFail()).isFalse();
     assertThat(options.isCaching()).isFalse();
     assertThat(options.getCache()).isEmpty();
-    assertThat(options.getMaxLoadedJsps()).isEqualTo(0);
-    assertThat(options.getJspIdleTimeout()).isEqualTo(0);
+    assertThat(options.getMaxLoadedJsps()).isZero();
+    assertThat(options.getJspIdleTimeout()).isZero();
     assertThat(options.getStrictQuoteEscaping()).isFalse();
     assertThat(options.getQuoteAttributeEL()).isFalse();
   }
@@ -88,6 +88,6 @@ void test_failure() throws Exception {
     doThrow(new IOException()).when(tldScanner).scan();
     assertThatThrownBy(() -> new JasperOptions(servletContext, output, tldScanner)).isInstanceOf(AnalysisException.class);
   }
-  
+
 
 }
diff --git a/java-surefire/src/test/java/org/sonar/plugins/surefire/api/SurefireUtilsTest.java b/java-surefire/src/test/java/org/sonar/plugins/surefire/api/SurefireUtilsTest.java
@@ -52,11 +52,13 @@ void should_get_report_paths_from_property() {
 
     assertThat(directories).hasSize(2);
     File directory1 = directories.get(0);
-    assertThat(directory1.exists()).isTrue();
-    assertThat(directory1.isDirectory()).isTrue();
+    assertThat(directory1)
+      .exists()
+      .isDirectory();
     File directory2 = directories.get(1);
-    assertThat(directory2.exists()).isTrue();
-    assertThat(directory2.isDirectory()).isTrue();
+    assertThat(directory2)
+      .exists()
+      .isDirectory();
     assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
   }
 
@@ -73,7 +75,7 @@ void return_default_value_if_property_unset() throws Exception {
     assertThat(directories).hasSize(1);
     File directory = directories.get(0);
     assertThat(directory.getCanonicalPath()).endsWith("target"+File.separator+"surefire-reports");
-    assertThat(directory.exists()).isFalse();
+    assertThat(directory).doesNotExist();
     assertThat(directory.isDirectory()).isFalse();
     assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
   }
