From 389280a2c0799e9a1c29919af670fecf5f1f6933 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 4 Dec 2018 17:58:07 +0100 Subject: [PATCH] SONAR-11480 Revert the warning when using module level coverage exclusions --- .../scanner/scan/filesystem/FileIndexer.java | 4 -- .../coverage/CoverageMediumTest.java | 43 ------------------- 2 files changed, 47 deletions(-) diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java index 4b801455774..46e60710237 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/FileIndexer.java @@ -162,10 +162,6 @@ public class FileIndexer { warnOnceDeprecatedCoverageExclusion( "File '" + inputFile + "' was excluded from coverage because patterns are still evaluated using module relative paths but this is deprecated. " + "Please update '" + CoreProperties.PROJECT_COVERAGE_EXCLUSIONS_PROPERTY + "' configuration so that patterns refer to project relative paths"); - } else { - warnOnceDeprecatedCoverageExclusion("Defining coverage exclusions at module level is deprecated. " + - "Move '" + CoreProperties.PROJECT_COVERAGE_EXCLUSIONS_PROPERTY + "' from module '" + module.getName() + "' " + - "to the root project and update patterns to refer to project relative paths"); } LOG.debug("File {} excluded for coverage", inputFile); } diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/CoverageMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/CoverageMediumTest.java index 1417262c3f9..cd41f6998cd 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/CoverageMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/coverage/CoverageMediumTest.java @@ -201,49 +201,6 @@ public class CoverageMediumTest { "configuration so that patterns refer to project relative paths"); } - @Test - public void warn_user_for_outdated_module_exclusions_for_multi_module_project() throws IOException { - - File baseDir = temp.getRoot(); - File baseDirModuleA = new File(baseDir, "moduleA"); - File baseDirModuleB = new File(baseDir, "moduleB"); - File srcDirA = new File(baseDirModuleA, "src"); - srcDirA.mkdirs(); - File srcDirB = new File(baseDirModuleB, "src"); - srcDirB.mkdirs(); - - File xooFileA = new File(srcDirA, "sample.xoo"); - File xooUtCoverageFileA = new File(srcDirA, "sample.xoo.coverage"); - FileUtils.write(xooFileA, "function foo() {\n if (a && b) {\nalert('hello');\n}\n}", StandardCharsets.UTF_8); - FileUtils.write(xooUtCoverageFileA, "2:2:2:1\n3:1", StandardCharsets.UTF_8); - - File xooFileB = new File(srcDirB, "sample.xoo"); - File xooUtCoverageFileB = new File(srcDirB, "sample.xoo.coverage"); - FileUtils.write(xooFileB, "function foo() {\n if (a && b) {\nalert('hello');\n}\n}", StandardCharsets.UTF_8); - FileUtils.write(xooUtCoverageFileB, "2:2:2:1\n3:1", StandardCharsets.UTF_8); - - AnalysisResult result = tester.newAnalysis() - .properties(ImmutableMap.builder() - .put("sonar.task", "scan") - .put("sonar.projectBaseDir", baseDir.getAbsolutePath()) - .put("sonar.projectKey", "com.foo.project") - .put("sonar.sources", "src") - .put("sonar.modules", "moduleA,moduleB") - .put("moduleB.sonar.coverage.exclusions", "src/sample.xoo") - .build()) - .execute(); - - InputFile fileA = result.inputFile("moduleA/src/sample.xoo"); - assertThat(result.coverageFor(fileA, 2)).isNotNull(); - - InputFile fileB = result.inputFile("moduleB/src/sample.xoo"); - assertThat(result.coverageFor(fileB, 2)).isNull(); - - assertThat(logTester.logs(LoggerLevel.WARN)).contains("Defining coverage exclusions at module level is deprecated. " + - "Move 'sonar.coverage.exclusions' from module 'moduleB' " + - "to the root project and update patterns to refer to project relative paths"); - } - @Test public void fallbackOnExecutableLines() throws IOException { -- 2.39.5