From 2f33b99fca829e628dd506f150d7a920c00d1489 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 10 Jul 2012 16:06:10 +0400 Subject: [PATCH] TestGen: Escape paths --- .../jetbrains/jet/test/generator/SimpleTestClassModel.java | 2 +- .../jetbrains/jet/test/generator/SimpleTestMethodModel.java | 2 +- .../tests/org/jetbrains/jet/test/generator/TestGenerator.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java index c76e8461aa7..62797a6b04e 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java @@ -111,7 +111,7 @@ public class SimpleTestClassModel implements TestClassModel { @Override public String getDataString() { - return rootFile.getPath(); + return JetTestUtils.getFilePath(rootFile); } @Override diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java index 1588255faca..815cdb12e96 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java @@ -44,7 +44,7 @@ public class SimpleTestMethodModel implements TestMethodModel { @Override public String getDataString() { - return FileUtil.getRelativePath(rootDir, file); + return JetTestUtils.getFilePath(new File(FileUtil.getRelativePath(rootDir, file))); } @Override diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java index 4821c8d04e3..4bf2e9084ed 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java @@ -65,7 +65,7 @@ public class TestGenerator { StringBuilder out = new StringBuilder(); Printer p = new Printer(out); - p.print(FileUtil.loadFile(new File("injector-generator/copyright.txt"))); + p.print(FileUtil.loadFile(new File("injector-generator/copyright.txt"), true)); p.println("package ", suiteClassPackage, ";"); p.println(); for (String importedClassName : JUNIT3_IMPORTS) { @@ -200,4 +200,4 @@ public class TestGenerator { p.println("@TestMetadata(\"", dataString, "\")"); } } -} \ No newline at end of file +}