diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index ed5b725e339..660ed06d52d 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -26,6 +26,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.ShutDownTracker; +import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; @@ -928,7 +929,7 @@ public class KotlinTestUtils { private static void assertFilePathPresent(File file, File rootFile, Set filePaths) { String path = FileUtil.getRelativePath(rootFile, file); if (path != null) { - String relativePath = FileUtil.nameToCompare(path); + String relativePath = nameToCompare(path); if (!filePaths.contains(relativePath)) { Assert.fail("Test data file missing from the generated test class: " + file + "\n" + PLEASE_REGENERATE_TESTS); } @@ -940,7 +941,7 @@ public class KotlinTestUtils { ContainerUtil.map(collectMethodsMetadata(testCaseClass), new Function() { @Override public String fun(String pathData) { - return FileUtil.nameToCompare(pathData); + return nameToCompare(pathData); } })); } @@ -1043,4 +1044,8 @@ public class KotlinTestUtils { //noinspection SpellCheckingInspection return testName.toLowerCase().startsWith("allfilespresentin"); } + + public static String nameToCompare(@NotNull String name) { + return (SystemInfo.isFileSystemCaseSensitive ? name : name.toLowerCase()).replace('\\', '/'); + } }