From 6d27bde4cbe9a8e9d3f04cbe04b2c119065276a0 Mon Sep 17 00:00:00 2001 From: Pavel Talanov Date: Mon, 6 Feb 2012 16:29:42 +0400 Subject: [PATCH] refactoring --- .../test/org/jetbrains/k2js/test/Suite.java | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/translator/test/org/jetbrains/k2js/test/Suite.java b/translator/test/org/jetbrains/k2js/test/Suite.java index 6ac98095385..a9d57d5c153 100644 --- a/translator/test/org/jetbrains/k2js/test/Suite.java +++ b/translator/test/org/jetbrains/k2js/test/Suite.java @@ -1,12 +1,12 @@ package org.jetbrains.k2js.test; import junit.framework.Test; -import junit.framework.TestResult; import org.jetbrains.annotations.NotNull; /** * @author Pavel Talanov */ +//TODO: this class has strange behaviour. Should be refactored. public final class Suite extends TranslationTest { private String name; @@ -21,6 +21,19 @@ public final class Suite extends TranslationTest { this.testMain = suiteDirName; } + public Suite() { + this("dummy", "dummy", new SingleFileTester() { + @Override + public void performTest(@NotNull Suite test, @NotNull String filename) throws Exception { + //do nothing + } + }); + } + + //NOTE: just to avoid warning + public void testNothing() { + } + @Override protected String mainDirectory() { return testMain; @@ -30,20 +43,6 @@ public final class Suite extends TranslationTest { tester.performTest(this, name); } - public static Test suite() { - return new Test() { - @Override - public int countTestCases() { - return 0; - } - - @Override - public void run(TestResult testResult) { - //do nothing - } - }; - } - public static Test suiteForDirectory(@NotNull final String mainName, @NotNull final SingleFileTester testMethod) { return TranslatorTestCaseBuilder.suiteForDirectory("translator\\testFiles\\", @@ -56,8 +55,7 @@ public final class Suite extends TranslationTest { }); } - protected interface SingleFileTester { + protected static interface SingleFileTester { void performTest(@NotNull Suite test, @NotNull String filename) throws Exception; - } }