From 5ab1c796e096d0b4524407827fd7c8488cace6e2 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 27 Jun 2012 17:39:45 +0400 Subject: [PATCH] Same file separators for generation tests on windows --- .../tests/org/jetbrains/jet/test/generator/Printer.java | 6 ++++++ .../org/jetbrains/jet/test/generator/TestDataFile.java | 2 +- .../org/jetbrains/jet/test/generator/TestDataSource.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/test/generator/Printer.java b/compiler/tests/org/jetbrains/jet/test/generator/Printer.java index e85b26965e5..979b4b9f80a 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/Printer.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/Printer.java @@ -18,6 +18,8 @@ package org.jetbrains.jet.test.generator; import org.jetbrains.annotations.NotNull; +import java.io.File; + /** * @author abreslav */ @@ -57,4 +59,8 @@ public class Printer { indent = indent.substring(INDENTATION_UNIT.length()); } + + public static String getFilePath(File file) { + return file.getPath().replaceAll("\\\\", "/"); + } } diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestDataFile.java b/compiler/tests/org/jetbrains/jet/test/generator/TestDataFile.java index ad51f30923a..a20614c9fa6 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestDataFile.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/TestDataFile.java @@ -34,7 +34,7 @@ public class TestDataFile { } public String getTestCall() { - return doTestMethodName + "(\"" + file + "\");"; + return doTestMethodName + "(\"" + Printer.getFilePath(file) + "\");"; } public String getTestMethodName() { diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java b/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java index c3430647ab5..31b1885fb1b 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/TestDataSource.java @@ -74,7 +74,7 @@ public class TestDataSource { } public void getAllTestsPresentCheck(@NotNull Printer p) { - p.println("allTestsPresent(" + getTestClassName() + ".class, new File(\"" + rootFile + "\"), " + recursive + ");"); + p.println("allTestsPresent(" + getTestClassName() + ".class, new File(\"" + Printer.getFilePath(rootFile) + "\"), " + recursive + ");"); } public String getAllTestsPresentMethodName() {