aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine/src/test
diff options
context:
space:
mode:
authorDuarte Meneses <duarte.meneses@sonarsource.com>2020-03-19 13:53:16 -0500
committersonartech <sonartech@sonarsource.com>2020-03-30 20:03:43 +0000
commit9ea4d1c0a65d82acd4c4d3628a82b6a673fcb0c9 (patch)
treed64b3dd5f0e67e9e506ab255aabeec8ec4070675 /sonar-scanner-engine/src/test
parent74384e67058fcfea16c80839740d28d9083b944a (diff)
downloadsonarqube-9ea4d1c0a65d82acd4c4d3628a82b6a673fcb0c9.tar.gz
sonarqube-9ea4d1c0a65d82acd4c4d3628a82b6a673fcb0c9.zip
fix tests on Windows
Diffstat (limited to 'sonar-scanner-engine/src/test')
-rw-r--r--sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
index 7850e6ed104..1f90a946b6c 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java
@@ -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);