From 5862ea00f0195915418c0e3e121c305cd0b97763 Mon Sep 17 00:00:00 2001 From: pTalanov Date: Wed, 29 Feb 2012 17:21:56 +0400 Subject: [PATCH] Fix name for tests. --- .../test/org/jetbrains/k2js/test/Suite.java | 17 ++++++++++------- .../k2js/test/TranslatorTestCaseBuilder.java | 4 +++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/k2js/test/Suite.java b/js/js.tests/test/org/jetbrains/k2js/test/Suite.java index 23ba6f2a5aa..4151de967e5 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/Suite.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/Suite.java @@ -35,6 +35,7 @@ public final class Suite extends TranslationTest { this.name = testName; this.tester = tester; this.testMain = suiteDirName; + setName(name); } public Suite() { @@ -67,13 +68,15 @@ public final class Suite extends TranslationTest { public static Test suiteForDirectory(@NotNull final String mainName, @NotNull final SingleFileTester testMethod) { return TranslatorTestCaseBuilder.suiteForDirectory(TranslationTest.TEST_FILES, - mainName + casesDirectoryName(), true, new TranslatorTestCaseBuilder.NamedTestFactory() { - @NotNull - @Override - public Test createTest(@NotNull String name) { - return (new Suite(name, mainName, testMethod)); - } - }); + mainName + casesDirectoryName(), + true, + new TranslatorTestCaseBuilder.NamedTestFactory() { + @NotNull + @Override + public Test createTest(@NotNull String name) { + return (new Suite(name, mainName, testMethod)); + } + }); } protected static interface SingleFileTester { diff --git a/js/js.tests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java b/js/js.tests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java index ff9a8ed4c78..4f6b8c7cdb2 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/TranslatorTestCaseBuilder.java @@ -53,6 +53,7 @@ public abstract class TranslatorTestCaseBuilder { public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, final FilenameFilter filter, @NotNull NamedTestFactory factory) { TestSuite suite = new TestSuite(dataPath); + suite.setName(dataPath); appendTestsInDirectory(baseDataDir, dataPath, recursive, filter, factory, suite); return suite; } @@ -75,7 +76,8 @@ public abstract class TranslatorTestCaseBuilder { return extensionFilter.accept(file, s) && filter.accept(file, s); } }; - } else { + } + else { resultFilter = extensionFilter; } File dir = new File(baseDataDir + dataPath);