]> source.dussan.org Git - sonarqube.git/commitdiff
fix tests on Windows
authorDuarte Meneses <duarte.meneses@sonarsource.com>
Thu, 19 Mar 2020 18:53:16 +0000 (13:53 -0500)
committersonartech <sonartech@sonarsource.com>
Mon, 30 Mar 2020 20:03:43 +0000 (20:03 +0000)
sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java

index 7850e6ed104b92a1fca6b1fc135e230a7ce5ccdf..1f90a946b6c8d7816270fa3487a55482b51ce2aa 100644 (file)
@@ -222,11 +222,11 @@ public class FileSystemMediumTest {
         .build())
       .execute();
 
-    assertThat(logTester.logs()).contains("'src/main/sample.java' indexed with no language");
+    assertThat(logTester.logs()).containsAnyOf("'src/main/sample.java' indexed with no language", "'src\\main\\sample.java' indexed with no language");
     assertThat(logTester.logs()).contains("3 files indexed");
     assertThat(logTester.logs()).contains("'src/main/sample.xoo' generated metadata with charset 'UTF-8'");
-    assertThat(String.join("\n", logTester.logs())).doesNotContain("'src/main/sample.java' generated metadata");
-    assertThat(String.join("\n", logTester.logs())).doesNotContain("'src/test/sample.java' generated metadata");
+    assertThat(logTester.logs()).doesNotContain("'src/main/sample.java' generated metadata", "'src\\main\\sample.java' generated metadata");
+    assertThat(logTester.logs()).doesNotContain("'src/test/sample.java' generated metadata", "'src\\test\\sample.java' generated metadata");
     DefaultInputFile javaInputFile = (DefaultInputFile) result.inputFile("src/main/sample.java");
 
     thrown.expect(IllegalStateException.class);