From f25cd16a641d611f05b840337080b95aedc265ef Mon Sep 17 00:00:00 2001 From: Sebastien Marichal Date: Mon, 12 Aug 2024 14:48:27 +0200 Subject: [PATCH] Fix Java ITs --- .../java/com/sonar/it/csharp/AnalysisWarningsTest.java | 10 +++++++--- its/src/test/java/com/sonar/it/shared/TestUtils.java | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/its/src/test/java/com/sonar/it/csharp/AnalysisWarningsTest.java b/its/src/test/java/com/sonar/it/csharp/AnalysisWarningsTest.java index ff6bbdf14c4..87a1767c390 100644 --- a/its/src/test/java/com/sonar/it/csharp/AnalysisWarningsTest.java +++ b/its/src/test/java/com/sonar/it/csharp/AnalysisWarningsTest.java @@ -52,7 +52,7 @@ void analysisWarningsImport() throws IOException { Ce.Task task = TestUtils.getAnalysisWarningsTask(ORCHESTRATOR, buildResult); assertThat(task.getStatus()).isEqualTo(Ce.TaskStatus.SUCCESS); - assertThat(task.getWarningsList()).containsExactly("First message", "Second message"); + assertThat(task.getWarningsList()).containsExactly("First message", "Second message", "Multi-Language analysis is enabled. If this was not intended, please set \"/d:sonar.scanner.scanAll=false\" in the begin step."); } @Test @@ -60,7 +60,9 @@ void analysisWarnings_MSBuild14() throws IOException { BuildResult buildResult = Tests.analyzeProject(temp, "Roslyn.1.3.2"); Ce.Task task = TestUtils.getAnalysisWarningsTask(ORCHESTRATOR, buildResult); assertThat(task.getStatus()).isEqualTo(Ce.TaskStatus.SUCCESS); - assertThat(task.getWarningsList()).containsExactly("The analysis using MsBuild 14 is no longer supported and the analysis with MsBuild 15 is deprecated. Please update your pipeline to MsBuild 16 or higher."); + assertThat(task.getWarningsList()).containsExactly( + "The analysis using MsBuild 14 is no longer supported and the analysis with MsBuild 15 is deprecated. Please update your pipeline to MsBuild 16 or higher.", + "Multi-Language analysis is enabled. If this was not intended, please set \"/d:sonar.scanner.scanAll=false\" in the begin step."); } @Test @@ -68,6 +70,8 @@ void analysisWarnings_MSBuild15() throws IOException { BuildResult buildResult = Tests.analyzeProject(temp, "Roslyn.2.4.0"); Ce.Task task = TestUtils.getAnalysisWarningsTask(ORCHESTRATOR, buildResult); assertThat(task.getStatus()).isEqualTo(Ce.TaskStatus.SUCCESS); - assertThat(task.getWarningsList()).containsExactly("The analysis using MsBuild 15 is deprecated. Please update your pipeline to MsBuild 16 or higher."); + assertThat(task.getWarningsList()).containsExactly( + "The analysis using MsBuild 15 is deprecated. Please update your pipeline to MsBuild 16 or higher.", + "Multi-Language analysis is enabled. If this was not intended, please set \"/d:sonar.scanner.scanAll=false\" in the begin step."); } } diff --git a/its/src/test/java/com/sonar/it/shared/TestUtils.java b/its/src/test/java/com/sonar/it/shared/TestUtils.java index 536d8b91fdf..3587dc953ac 100644 --- a/its/src/test/java/com/sonar/it/shared/TestUtils.java +++ b/its/src/test/java/com/sonar/it/shared/TestUtils.java @@ -106,7 +106,8 @@ public static void verifyGuiTestOnlyProjectAnalysisWarning(Orchestrator orchestr + " and no MAIN-code for any language, so only TEST-code related results are imported. " + "Many of our rules (e.g. vulnerabilities) are raised only on MAIN-code. " + "Read more about how the SonarScanner for .NET detects test projects: " - + "https://github.com/SonarSource/sonar-scanner-msbuild/wiki/Analysis-of-product-projects-vs.-test-projects"); + + "https://github.com/SonarSource/sonar-scanner-msbuild/wiki/Analysis-of-product-projects-vs.-test-projects", + "Multi-Language analysis is enabled. If this was not intended, please set \"/d:sonar.scanner.scanAll=false\" in the begin step."); } public static Ce.Task getAnalysisWarningsTask(Orchestrator orchestrator, BuildResult buildResult) {