SONARPY-1423 code fixes (#1547)

maksim-grebeniuk-sonarsource · web-flow · commit 0030207796b9 · 2023-08-18T14:44:46.000+02:00
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/BanditReportTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/BanditReportTest.java
@@ -28,15 +28,15 @@
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Issues;
 
-import static com.sonar.python.it.plugin.Tests.issues;
+import static com.sonar.python.it.plugin.TestsUtils.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class BanditReportTest {
 
   private static final String PROJECT = "bandit_project";
 
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   @Test
   void import_report() {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CPDTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CPDTest.java
@@ -27,7 +27,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import static com.sonar.python.it.plugin.Tests.getMeasureAsDouble;
+import static com.sonar.python.it.plugin.TestsUtils.getMeasureAsDouble;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class CPDTest {
@@ -44,7 +44,7 @@ class CPDTest {
   private static final String DUPLICATED_LINES_DENSITY = "duplicated_lines_density";
 
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   @BeforeAll
   static void startServer() {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CoverageTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CoverageTest.java
@@ -36,7 +36,7 @@ class CoverageTest {
 
   private static final String COVERAGE_PROJECT = "projects/coverage_project";
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   private static final String PROJECT_KEY = "coverage_project";
   private static final String LINES_TO_COVER = "lines_to_cover";
@@ -72,7 +72,7 @@ private static void basicCoverageReports(String utReportPath) {
         .put(BRANCH_COVERAGE, 100)
         .build();
 
-    Tests.assertProjectMeasures(PROJECT_KEY, values);
+    TestsUtils.assertProjectMeasures(PROJECT_KEY, values);
     assertThat(result.getLogs()).contains("Property 'sonar.python.coverage.reportPath' has been removed. Please use 'sonar.python.coverage.reportPaths' instead.");
   }
 
@@ -88,7 +88,7 @@ void default_values() {
       .put(LINE_COVERAGE, 28)
       .put(BRANCH_COVERAGE, 0)
       .build();
-    Tests.assertProjectMeasures(PROJECT_KEY, values);
+    TestsUtils.assertProjectMeasures(PROJECT_KEY, values);
   }
 
   @Test
@@ -104,7 +104,7 @@ void empty_property() {
     expected.put(COVERAGE, 0);
     expected.put(LINE_COVERAGE, 0);
     expected.put(BRANCH_COVERAGE, null);
-    Tests.assertProjectMeasures(PROJECT_KEY, expected);
+    TestsUtils.assertProjectMeasures(PROJECT_KEY, expected);
   }
 
   @Test
@@ -122,7 +122,7 @@ void empty_coverage_report() {
       }
     }
     assertThat(nbLog).isEqualTo(1);
-    assertThat(Tests.getMeasureAsDouble(PROJECT_KEY, COVERAGE)).isZero();
+    assertThat(TestsUtils.getMeasureAsDouble(PROJECT_KEY, COVERAGE)).isZero();
   }
 
 }
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CustomRulesTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/CustomRulesTest.java
@@ -29,14 +29,14 @@
 import org.sonarqube.ws.Issues;
 import org.sonarqube.ws.client.issues.SearchRequest;
 
-import static com.sonar.python.it.plugin.Tests.newWsClient;
+import static com.sonar.python.it.plugin.TestsUtils.newWsClient;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class CustomRulesTest {
 
   @RegisterExtension
-  public static final OrchestratorExtension orchestrator = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension orchestrator = TestsUtils.ORCHESTRATOR;
 
   private static final String PROJECT_KEY = "custom-rules";
   private static final String PROJECT_NAME = "Custom Rules";
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/Flake8ReportTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/Flake8ReportTest.java
@@ -28,15 +28,15 @@
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Issues;
 
-import static com.sonar.python.it.plugin.Tests.issues;
+import static com.sonar.python.it.plugin.TestsUtils.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class Flake8ReportTest {
 
   private static final String PROJECT = "flake8_project";
 
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   @Test
   void import_report() {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/IPythonTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/IPythonTest.java
@@ -63,7 +63,7 @@ class IPythonTest {
   @BeforeAll
   static void prepare() throws Exception {
     StandaloneGlobalConfiguration sonarLintConfig = StandaloneGlobalConfiguration.builder()
-      .addPlugin(Tests.PLUGIN_LOCATION.getFile().toPath())
+      .addPlugin(TestsUtils.PLUGIN_LOCATION.getFile().toPath())
       .setSonarLintUserHome(TEMP)
       .addEnabledLanguage(Language.IPYTHON)
       .setLogOutput((formattedMessage, level) -> {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MetricsTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MetricsTest.java
@@ -29,9 +29,9 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.sonarqube.ws.Measures.Measure;
 
-import static com.sonar.python.it.plugin.Tests.getMeasure;
-import static com.sonar.python.it.plugin.Tests.getMeasureAsDouble;
-import static com.sonar.python.it.plugin.Tests.getMeasureAsInt;
+import static com.sonar.python.it.plugin.TestsUtils.getMeasure;
+import static com.sonar.python.it.plugin.TestsUtils.getMeasureAsDouble;
+import static com.sonar.python.it.plugin.TestsUtils.getMeasureAsInt;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class MetricsTest {
@@ -65,7 +65,7 @@ class MetricsTest {
   private static final Offset<Double> OFFSET = Offset.offset(0.01d);
 
   @RegisterExtension
-  public static final OrchestratorExtension orchestrator = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension orchestrator = TestsUtils.ORCHESTRATOR;
 
   private static BuildResult buildResult;
 
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MypyReportTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/MypyReportTest.java
@@ -28,15 +28,15 @@
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Issues;
 
-import static com.sonar.python.it.plugin.Tests.issues;
+import static com.sonar.python.it.plugin.TestsUtils.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class MypyReportTest {
 
   private static final String PROJECT = "mypy_project";
 
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   @Test
   void import_report() {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/NoSonarTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/NoSonarTest.java
@@ -28,7 +28,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.sonarqube.ws.Issues;
 
-import static com.sonar.python.it.plugin.Tests.issues;
+import static com.sonar.python.it.plugin.TestsUtils.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class NoSonarTest {
@@ -37,7 +37,7 @@ class NoSonarTest {
   private static final String PROFILE_NAME = "nosonar";
 
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   @BeforeAll
   static void startServer() {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/PylintReportTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/PylintReportTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import static com.sonar.python.it.plugin.Tests.issues;
+import static com.sonar.python.it.plugin.TestsUtils.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class PylintReportTest {
@@ -35,7 +35,7 @@ class PylintReportTest {
   private static final String LEGACY_PROPERTY = "sonar.python.pylint.reportPath";
 
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   @Test
   void import_report() {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/RuffReportTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/RuffReportTest.java
@@ -30,15 +30,15 @@
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Issues;
 
-import static com.sonar.python.it.plugin.Tests.issues;
+import static com.sonar.python.it.plugin.TestsUtils.issues;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class RuffReportTest {
 
   private final String PROJECT = "ruff_project";
 
   @RegisterExtension
-  public static final Orchestrator ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final Orchestrator ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   @Test
   void import_report() {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/SonarLintTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/SonarLintTest.java
@@ -66,7 +66,7 @@ class SonarLintTest {
   @BeforeAll
   static void prepare() throws Exception {
     StandaloneGlobalConfiguration sonarLintConfig = StandaloneGlobalConfiguration.builder()
-      .addPlugin(Tests.PLUGIN_LOCATION.getFile().toPath())
+      .addPlugin(TestsUtils.PLUGIN_LOCATION.getFile().toPath())
       .setSonarLintUserHome(TEMP)
       .addEnabledLanguage(Language.PYTHON)
       .setLogOutput((formattedMessage, level) -> {
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/TestReportTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/TestReportTest.java
@@ -32,7 +32,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import static com.sonar.python.it.plugin.Tests.assertProjectMeasures;
+import static com.sonar.python.it.plugin.TestsUtils.assertProjectMeasures;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class TestReportTest {
@@ -45,7 +45,7 @@ class TestReportTest {
   public static final String TEST_EXECUTION_TIME = "test_execution_time";
 
   @RegisterExtension
-  public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;
 
   private static SonarScanner createBuild(String projectKey, String testReportPath) {
     return SonarScanner.create()
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/TestRulesTest.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/TestRulesTest.java
@@ -29,14 +29,14 @@
 import org.sonarqube.ws.Issues;
 import org.sonarqube.ws.client.issues.SearchRequest;
 
-import static com.sonar.python.it.plugin.Tests.newWsClient;
+import static com.sonar.python.it.plugin.TestsUtils.newWsClient;
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 class TestRulesTest {
 
   @RegisterExtension
-  public static final OrchestratorExtension orchestrator = Tests.ORCHESTRATOR;
+  public static final OrchestratorExtension orchestrator = TestsUtils.ORCHESTRATOR;
   private static final String PROJECT_KEY = "test-rules";
   private static final String PROJECT_NAME = "Test Rules";
 
diff --git a/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/TestsUtils.java b/its/plugin/it-python-plugin-test/src/test/java/com/sonar/python/it/plugin/TestsUtils.java
@@ -42,7 +42,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 
-public final class Tests {
+public final class TestsUtils {
 
   private static final String SQ_VERSION_PROPERTY = "sonar.runtimeVersion";
   private static final String DEFAULT_SQ_VERSION = "LATEST_RELEASE";
@@ -62,7 +62,7 @@ public final class Tests {
     .restoreProfileAtStartup(FileLocation.of("profiles/nosonar.xml"))
     .build();
 
-  private Tests() {
+  private TestsUtils() {
     // utility class
   }
 
diff --git a/python-frontend/src/main/java/org/sonar/plugins/python/api/PythonVersionUtils.java b/python-frontend/src/main/java/org/sonar/plugins/python/api/PythonVersionUtils.java
@@ -20,7 +20,6 @@
 package org.sonar.plugins.python.api;
 
 import java.util.EnumSet;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import org.slf4j.Logger;
@@ -166,17 +165,17 @@ private static boolean guessPythonVersion(Set<Version> pythonVersions, String ve
   }
 
   private static void logErrorMessage(String propertyValue) {
-    String prefix = "Error while parsing value of parameter '%s' (%s). Versions must be specified as MAJOR_VERSION.MIN.VERSION (e.g. \"3.7, 3.8\")";
-    LOG.warn(String.format(Locale.ROOT, prefix, PYTHON_VERSION_KEY, propertyValue));
+    LOG.warn(
+      "Error while parsing value of parameter '{}' ({}). Versions must be specified as MAJOR_VERSION.MIN.VERSION (e.g. \"3.7, 3.8\")",
+      PYTHON_VERSION_KEY,
+      propertyValue);
   }
 
   private static void logWarningGuessVersion(String propertyValue, Version guessedVersion) {
-    String prefix = "No explicit support for version %s. Python version has been set to %s.";
-    LOG.warn(String.format(Locale.ROOT, prefix, propertyValue, guessedVersion));
+    LOG.warn("No explicit support for version {}. Python version has been set to {}.", propertyValue, guessedVersion);
   }
 
   private static void logWarningPython2(String propertyValue) {
-    String prefix = "No explicit support for version %s. Support for Python versions prior to 3 is deprecated.";
-    LOG.warn(String.format(Locale.ROOT, prefix, propertyValue));
+    LOG.warn("No explicit support for version {}. Support for Python versions prior to 3 is deprecated.", propertyValue);
   }
 }
diff --git a/python-frontend/src/test/java/org/sonar/python/regex/PythonAnalyzerRegexSourceTest.java b/python-frontend/src/test/java/org/sonar/python/regex/PythonAnalyzerRegexSourceTest.java
@@ -45,7 +45,7 @@ class PythonAnalyzerRegexSourceTest {
 
   @Test
   // TODO: Extend test with exact syntax error location check
-  public void invalidRegex() {
+  void invalidRegex() {
     RegexSource source = makeSource("r'+'");
     RegexParseResult result = new RegexParser(source, new FlagSet()).parse();
 
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/Scanner.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/Scanner.java
@@ -40,7 +40,8 @@ protected Scanner(SensorContext context) {
 
   public void execute(List<InputFile> files, SensorContext context) {
     ProgressReport progressReport = new ProgressReport(this.name() + " progress", TimeUnit.SECONDS.toMillis(10));
-    LOG.info("Starting " + this.name());
+    String name = this.name();
+    LOG.info("Starting {}", name);
     List<String> filenames = files.stream().map(InputFile::toString).collect(Collectors.toList());
 
     int numScannedWithoutParsing = 0;
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/coverage/PythonCoverageSensor.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/coverage/PythonCoverageSensor.java
@@ -131,7 +131,7 @@ private static void saveMeasures(Map<InputFile, NewCoverage> coverageMeasures, H
       InputFile inputFile = entry.getKey();
       coveredFiles.add(inputFile);
       if (LOG.isDebugEnabled()) {
-        LOG.debug("Saving coverage measures for file '{}'", inputFile.toString());
+        LOG.debug("Saving coverage measures for file '{}'", inputFile);
       }
       entry.getValue()
         .save();
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/indexer/PythonIndexer.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/indexer/PythonIndexer.java
@@ -60,12 +60,13 @@ public String packageName(InputFile inputFile) {
 
   void removeFile(InputFile inputFile) {
     String packageName = packageNames.get(inputFile.uri());
+    String filename = inputFile.filename();
     if (packageName == null) {
-      LOG.debug("Failed to remove file \"{}\" from project-level symbol table (file not indexed)", inputFile.filename());
+      LOG.debug("Failed to remove file \"{}\" from project-level symbol table (file not indexed)", filename);
       return;
     }
     packageNames.remove(inputFile.uri());
-    projectLevelSymbolTable.removeModule(packageName, inputFile.filename());
+    projectLevelSymbolTable.removeModule(packageName, filename);
   }
 
   void addFile(InputFile inputFile) throws IOException {
@@ -122,7 +123,7 @@ protected void scanFile(InputFile inputFile) throws IOException {
 
     @Override
     protected void processException(Exception e, InputFile file) {
-      LOG.debug("Unable to construct project-level symbol table for file: " + file);
+      LOG.debug("Unable to construct project-level symbol table for file: {}", file);
       LOG.debug(e.getMessage());
     }
   }
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/indexer/SonarLintPythonIndexer.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/indexer/SonarLintPythonIndexer.java
@@ -67,7 +67,7 @@ public void buildOnce(SensorContext context) {
       LOG.debug("Update \"sonar.python.sonarlint.indexing.maxlines\" to set a different limit.");
       return;
     }
-    LOG.debug("Input files for indexing: " + files);
+    LOG.debug("Input files for indexing: {}", files);
     // computes "globalSymbolsByModuleName"
     GlobalSymbolsScanner globalSymbolsStep = new GlobalSymbolsScanner(context);
     globalSymbolsStep.execute(files, context);
@@ -107,7 +107,7 @@ public void process(ModuleFileEvent moduleFileEvent) {
     InputFile target = moduleFileEvent.getTarget();
     String language = target.language();
     if (language == null || !language.equals(Python.KEY)) {
-      LOG.debug("Module file event for " + target + " has been ignored because it's not a Python file.");
+      LOG.debug("Module file event for {} has been ignored because it's not a Python file.", target);
       return;
     }
     ModuleFileEvent.Type type = moduleFileEvent.getType();
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/indexer/SonarQubePythonIndexer.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/indexer/SonarQubePythonIndexer.java
@@ -76,7 +76,7 @@ public SonarQubePythonIndexer(List<InputFile> inputFiles, CacheContext cacheCont
 
   @Override
   public void buildOnce(SensorContext context) {
-    LOG.debug("Input files for indexing: " + mainFiles);
+    LOG.debug("Input files for indexing: {}", mainFiles);
     if (shouldOptimizeAnalysis(context)) {
       computeGlobalSymbolsUsingCache(context);
       return;
diff --git a/sonar-python-plugin/src/main/java/org/sonar/plugins/python/xunit/PythonXUnitSensor.java b/sonar-python-plugin/src/main/java/org/sonar/plugins/python/xunit/PythonXUnitSensor.java
diff --git a/sonar-python-plugin/src/test/java/org/sonar/plugins/python/parser/StaxParserTest.java b/sonar-python-plugin/src/test/java/org/sonar/plugins/python/parser/StaxParserTest.java

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class CoverageTest {`
`36`	`36`
`37`	`37`	`private static final String COVERAGE_PROJECT = "projects/coverage_project";`
`38`	`38`	`@RegisterExtension`
`39`		`- public static final OrchestratorExtension ORCHESTRATOR = Tests.ORCHESTRATOR;`
	`39`	`+ public static final OrchestratorExtension ORCHESTRATOR = TestsUtils.ORCHESTRATOR;`
`40`	`40`
`41`	`41`	`private static final String PROJECT_KEY = "coverage_project";`
`42`	`42`	`private static final String LINES_TO_COVER = "lines_to_cover";`
`@@ -72,7 +72,7 @@ private static void basicCoverageReports(String utReportPath) {`
`72`	`72`	`.put(BRANCH_COVERAGE, 100)`
`73`	`73`	`.build();`
`74`	`74`
`75`		`- Tests.assertProjectMeasures(PROJECT_KEY, values);`
	`75`	`+ TestsUtils.assertProjectMeasures(PROJECT_KEY, values);`
`76`	`76`	`assertThat(result.getLogs()).contains("Property 'sonar.python.coverage.reportPath' has been removed. Please use 'sonar.python.coverage.reportPaths' instead.");`
`77`	`77`	`}`
`78`	`78`
`@@ -88,7 +88,7 @@ void default_values() {`
`88`	`88`	`.put(LINE_COVERAGE, 28)`
`89`	`89`	`.put(BRANCH_COVERAGE, 0)`
`90`	`90`	`.build();`
`91`		`- Tests.assertProjectMeasures(PROJECT_KEY, values);`
	`91`	`+ TestsUtils.assertProjectMeasures(PROJECT_KEY, values);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Test`
`@@ -104,7 +104,7 @@ void empty_property() {`
`104`	`104`	`expected.put(COVERAGE, 0);`
`105`	`105`	`expected.put(LINE_COVERAGE, 0);`
`106`	`106`	`expected.put(BRANCH_COVERAGE, null);`
`107`		`- Tests.assertProjectMeasures(PROJECT_KEY, expected);`
	`107`	`+ TestsUtils.assertProjectMeasures(PROJECT_KEY, expected);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`@Test`
`@@ -122,7 +122,7 @@ void empty_coverage_report() {`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`assertThat(nbLog).isEqualTo(1);`
`125`		`- assertThat(Tests.getMeasureAsDouble(PROJECT_KEY, COVERAGE)).isZero();`
	`125`	`+ assertThat(TestsUtils.getMeasureAsDouble(PROJECT_KEY, COVERAGE)).isZero();`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`}`