SONARPY-1428 fixes (#1545)

Author: maksim-grebeniuk-sonarsource

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/BanditReportTest.java

@@ -31,15 +31,15 @@
 import static com.sonar.python.it.plugin.Tests.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BanditReportTest {
+class BanditReportTest {
 
   private static final String PROJECT = "bandit_project";
 
   @RegisterExtension
   public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   @Test
-  public void import_report() {
+  void import_report() {
     ORCHESTRATOR.getServer().provisionProject(PROJECT, PROJECT);
     ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT, "py", "no_rule");
     ORCHESTRATOR.executeBuild(

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CPDTest.java

@@ -30,7 +30,7 @@
 import static com.sonar.python.it.plugin.Tests.getMeasureAsDouble;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CPDTest {
+class CPDTest {
 
   private static final String PROJECT_KEY = "cpd";
 
@@ -47,7 +47,7 @@ public class CPDTest {
   public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   @BeforeAll
-  public static void startServer() {
+  static void startServer() {
     ORCHESTRATOR.getServer().provisionProject(PROJECT_KEY, PROJECT_KEY);
     ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT_KEY, "py", "no_rule");
     SonarScanner build = SonarScanner.create()
@@ -61,7 +61,7 @@ public static void startServer() {
   }
 
   @Test
-  public void test_cpd() {
+  void test_cpd() {
     Offset<Double> offset = Offset.offset(0.01d);
 
     assertThat(getMeasureAsDouble(FILE_1_KEY, DUPLICATED_LINES)).isEqualTo(27.0d, offset);

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CoverageTest.java

@@ -32,7 +32,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CoverageTest {
+class CoverageTest {
 
   private static final String COVERAGE_PROJECT = "projects/coverage_project";
   @RegisterExtension
@@ -48,12 +48,12 @@ public class CoverageTest {
   private static final String COVERAGE_REPORT_PATHS = "sonar.python.coverage.reportPaths";
 
   @Test
-  public void basic_coverage_reports_with_unix_paths() {
+  void basic_coverage_reports_with_unix_paths() {
     basicCoverageReports("ut-coverage.xml");
   }
 
   @Test
-  public void basic_coverage_reports_with_windows_paths() {
+  void basic_coverage_reports_with_windows_paths() {
     basicCoverageReports("ut-coverage-windowspaths.xml");
   }
 
@@ -77,7 +77,7 @@ private static void basicCoverageReports(String utReportPath) {
   }
 
   @Test
-  public void default_values() {
+  void default_values() {
     SonarScanner build = SonarScanner.create()
       .setProjectDir(new File(COVERAGE_PROJECT));
     ORCHESTRATOR.executeBuild(build);
@@ -92,7 +92,7 @@ public void default_values() {
   }
 
   @Test
-  public void empty_property() {
+  void empty_property() {
     SonarScanner build = SonarScanner.create()
       .setProjectDir(new File(COVERAGE_PROJECT))
       .setProperty(DEPRECATED_COVERAGE_REPORT_PATH, "")
@@ -108,7 +108,7 @@ public void empty_property() {
   }
 
   @Test
-  public void empty_coverage_report() {
+  void empty_coverage_report() {
     SonarScanner build = SonarScanner.create()
       .setProjectDir(new File(COVERAGE_PROJECT))
       .setProperty(DEPRECATED_COVERAGE_REPORT_PATH, EMPTY_XML)

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CustomRulesTest.java

@@ -33,7 +33,7 @@
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CustomRulesTest {
+class CustomRulesTest {
 
   @RegisterExtension
   public static final OrchestratorExtension orchestrator = Tests.ORCHESTRATOR;
@@ -42,7 +42,7 @@ public class CustomRulesTest {
   private static final String PROJECT_NAME = "Custom Rules";
 
   @BeforeAll
-  public static void prepare() {
+  static void prepare() {
     orchestrator.getServer().provisionProject(PROJECT_KEY, PROJECT_NAME);
     orchestrator.getServer().associateProjectToQualityProfile(PROJECT_KEY, "py", "python-custom-rules-profile");
     SonarScanner build = SonarScanner.create()
@@ -55,13 +55,13 @@ public static void prepare() {
   }
 
   @Test
-  public void base_tree_visitor_check() {
+  void base_tree_visitor_check() {
     List<Issues.Issue> issues = issues("python-custom-rules:visitor");
     assertSingleIssue(issues, 4, "Function def.", "5min");
   }
 
   @Test
-  public void subscription_base_visitor_check() {
+  void subscription_base_visitor_check() {
     List<Issues.Issue> issues = issues("python-custom-rules:subscription");
     assertSingleIssue(issues, 7, "For statement.", "10min");
   }

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/Flake8ReportTest.java

@@ -31,15 +31,15 @@
 import static com.sonar.python.it.plugin.Tests.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class Flake8ReportTest {
+class Flake8ReportTest {
 
   private static final String PROJECT = "flake8_project";
 
   @RegisterExtension
   public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   @Test
-  public void import_report() {
+  void import_report() {
     ORCHESTRATOR.getServer().provisionProject(PROJECT, PROJECT);
     ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT, "py", "no_rule");
     ORCHESTRATOR.executeBuild(

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/IPythonTest.java

@@ -53,15 +53,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 
-public class IPythonTest {
+class IPythonTest {
 
   @TempDir
   public static Path TEMP;
 
   private static StandaloneSonarLintEngine sonarlintEngine;
 
   @BeforeAll
-  public static void prepare() throws Exception {
+  static void prepare() throws Exception {
     StandaloneGlobalConfiguration sonarLintConfig = StandaloneGlobalConfiguration.builder()
       .addPlugin(Tests.PLUGIN_LOCATION.getFile().toPath())
       .setSonarLintUserHome(TEMP)
@@ -74,12 +74,12 @@ public static void prepare() throws Exception {
   }
 
   @AfterAll
-  public static void stop() {
+  static void stop() {
     sonarlintEngine.stop();
   }
 
   @Test
-  public void shouldRaiseIssues() {
+  void shouldRaiseIssues() {
     var inputFile = createInputFile(Path.of("projects/ipynb_project/file1.ipynb"), "file1.ipynb", false);
     var issues = new ArrayList<Issue>();
 

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MetricsTest.java

@@ -34,7 +34,7 @@
 import static com.sonar.python.it.plugin.Tests.getMeasureAsInt;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MetricsTest {
+class MetricsTest {
 
   private static final String PROJECT_KEY = "metrics";
 
@@ -70,7 +70,7 @@ public class MetricsTest {
   private static BuildResult buildResult;
 
   @BeforeAll
-  public static void startServer() {
+  static void startServer() {
     orchestrator.getServer().provisionProject(PROJECT_KEY, PROJECT_KEY);
     orchestrator.getServer().associateProjectToQualityProfile(PROJECT_KEY, "py", "no_rule");
     SonarScanner build = SonarScanner.create()
@@ -84,7 +84,7 @@ public static void startServer() {
   }
 
   @Test
-  public void project_level() {
+  void project_level() {
     // Size
     assertThat(getProjectMeasureAsInt(NCLOC)).isEqualTo(6);
     assertThat(getProjectMeasureAsInt(LINES)).isEqualTo(13);
@@ -113,7 +113,7 @@ public void project_level() {
   }
 
   @Test
-  public void directory_level() {
+  void directory_level() {
     // Size
     assertThat(getDirectoryMeasureAsInt(NCLOC)).isEqualTo(6);
     assertThat(getDirectoryMeasureAsInt(LINES)).isEqualTo(13);
@@ -139,7 +139,7 @@ public void directory_level() {
   }
 
   @Test
-  public void file_level() {
+  void file_level() {
     // Size
     assertThat(getFileMeasureAsInt(NCLOC)).isEqualTo(1);
     assertThat(getFileMeasureAsInt(LINES)).isEqualTo(6);
@@ -168,7 +168,7 @@ public void file_level() {
    * SONARPLUGINS-2184
    */
   @Test
-  public void should_be_compatible_with_DevCockpit() {
+  void should_be_compatible_with_DevCockpit() {
     // TODO probably bug in Sonar: order might depend on JVM
     assertThat(getFileMeasure(NCLOC_DATA).getValue())
       .doesNotContain("1=1")

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MypyReportTest.java

@@ -31,15 +31,15 @@
 import static com.sonar.python.it.plugin.Tests.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class MypyReportTest {
+class MypyReportTest {
 
   private static final String PROJECT = "mypy_project";
 
   @RegisterExtension
   public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   @Test
-  public void import_report() {
+  void import_report() {
     ORCHESTRATOR.getServer().provisionProject(PROJECT, PROJECT);
     ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT, "py", "no_rule");
     ORCHESTRATOR.executeBuild(

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/NoSonarTest.java

@@ -31,7 +31,7 @@
 import static com.sonar.python.it.plugin.Tests.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class NoSonarTest {
+class NoSonarTest {
 
   private static final String PROJECT_KEY = "nosonar";
   private static final String PROFILE_NAME = "nosonar";
@@ -40,7 +40,7 @@ public class NoSonarTest {
   public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   @BeforeAll
-  public static void startServer() {
+  static void startServer() {
     ORCHESTRATOR.getServer().provisionProject(PROJECT_KEY, PROJECT_KEY);
     ORCHESTRATOR.getServer().associateProjectToQualityProfile(PROJECT_KEY, "py", PROFILE_NAME);
     SonarScanner build = SonarScanner.create()
@@ -53,7 +53,7 @@ public static void startServer() {
   }
 
   @Test
-  public void test_nosonar() {
+  void test_nosonar() {
     List<Issues.Issue> issues = issues(PROJECT_KEY);
     assertThat(issues).hasSize(2);
     assertThat(issues.get(0).getRule()).isEqualTo("python:PrintStatementUsage");

its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/PylintReportTest.java

@@ -29,7 +29,7 @@
 import static com.sonar.python.it.plugin.Tests.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class PylintReportTest {
+class PylintReportTest {
 
   private static final String DEFAULT_PROPERTY = "sonar.python.pylint.reportPaths";
   private static final String LEGACY_PROPERTY = "sonar.python.pylint.reportPath";
@@ -38,43 +38,43 @@ public class PylintReportTest {
   public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
 
   @Test
-  public void import_report() {
+  void import_report() {
     final String projectKey = "pylint_project";
     analyseProjectWithReport(projectKey, DEFAULT_PROPERTY, "pylint-report.txt");
     assertThat(issues(projectKey)).hasSize(4);
   }
 
   @Test
-  public void import_report_legacy_key() {
+  void import_report_legacy_key() {
     final String projectKey = "pylint_project_legacy_key";
     analyseProjectWithReport(projectKey, LEGACY_PROPERTY, "pylint-report.txt");
     assertThat(issues(projectKey)).hasSize(4);
   }
 
   @Test
-  public void missing_report() {
+  void missing_report() {
     final String projectKey = "pylint_project_missing_report";
     analyseProjectWithReport(projectKey, DEFAULT_PROPERTY, "missing");
     assertThat(issues(projectKey)).isEmpty();
   }
 
   @Test
-  public void invalid_report() {
+  void invalid_report() {
     final String projectKey = "pylint_project_invalid_report";
     BuildResult result = analyseProjectWithReport(projectKey, DEFAULT_PROPERTY, "invalid.txt");
     assertThat(result.getLogs()).contains("Cannot parse the line: trash");
     assertThat(issues(projectKey)).isEmpty();
   }
 
   @Test
-  public void unknown_rule() {
+  void unknown_rule() {
     final String projectKey = "pylint_project_unknown_rule";
     analyseProjectWithReport(projectKey, DEFAULT_PROPERTY, "rule-unknown.txt");
     assertThat(issues(projectKey)).hasSize(4);
   }
 
   @Test
-  public void multiple_reports() {
+  void multiple_reports() {
     final String projectKey = "pylint_project_multiple_reports";
     analyseProjectWithReport(projectKey, DEFAULT_PROPERTY, "pylint-report.txt, rule-unknown.txt");
     assertThat(issues(projectKey)).hasSize(8);