From ed1ca4b77eca581858c855022b794ca6fee9aa9d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 9 Jul 2012 20:53:05 +0400 Subject: [PATCH] Escape all names that turn into Java identifiers --- .../jetbrains/jet/test/generator/SimpleTestClassModel.java | 5 +++-- .../jetbrains/jet/test/generator/SimpleTestMethodModel.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java index bc960210506..764bb73b917 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java @@ -41,7 +41,7 @@ public class SimpleTestClassModel implements TestClassModel { this.recursive = recursive; this.extension = extension; this.doTestMethodName = doTestMethodName; - this.testClassName = StringUtil.capitalize(rootFile.getName()); + this.testClassName = StringUtil.capitalize(TestGeneratorUtil.escapeForJavaIdentifier(rootFile.getName())); } @Override @@ -71,7 +71,7 @@ public class SimpleTestClassModel implements TestClassModel { result.add(new TestMethodModel() { @Override public String getName() { - return "testAllFilesPresentIn" + StringUtil.capitalize(rootFile.getName()); + return "testAllFilesPresentIn" + testClassName; } @Override @@ -84,6 +84,7 @@ public class SimpleTestClassModel implements TestClassModel { "\", ", recursive, ");"); } + }); File[] listFiles = rootFile.listFiles(); diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java index 298db910aea..0e58d48b5d0 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java @@ -53,6 +53,6 @@ public class SimpleTestMethodModel implements TestMethodModel { String relativePath = FileUtil.getRelativePath(rootDir, file.getParentFile()); unescapedName = relativePath + "-" + StringUtil.capitalize(fileName); } - return "test" + TestGeneratorUtil.escapeForJavaIdentifier(StringUtil.capitalize(unescapedName)); + return "test" + StringUtil.capitalize(TestGeneratorUtil.escapeForJavaIdentifier(unescapedName)); } }