From 9ea4d1c0a65d82acd4c4d3628a82b6a673fcb0c9 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Thu, 19 Mar 2020 13:53:16 -0500 Subject: [PATCH] fix tests on Windows --- .../sonar/scanner/mediumtest/fs/FileSystemMediumTest.java | 6 +++--- 1 file 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); -- 2.39.5