refactoring

This commit is contained in:
Pavel Talanov
2012-02-06 16:29:42 +04:00
parent e1513ae579
commit 6d27bde4cb
@@ -1,12 +1,12 @@
package org.jetbrains.k2js.test; package org.jetbrains.k2js.test;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestResult;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
/** /**
* @author Pavel Talanov * @author Pavel Talanov
*/ */
//TODO: this class has strange behaviour. Should be refactored.
public final class Suite extends TranslationTest { public final class Suite extends TranslationTest {
private String name; private String name;
@@ -21,6 +21,19 @@ public final class Suite extends TranslationTest {
this.testMain = suiteDirName; 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 @Override
protected String mainDirectory() { protected String mainDirectory() {
return testMain; return testMain;
@@ -30,20 +43,6 @@ public final class Suite extends TranslationTest {
tester.performTest(this, name); 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) { public static Test suiteForDirectory(@NotNull final String mainName, @NotNull final SingleFileTester testMethod) {
return TranslatorTestCaseBuilder.suiteForDirectory("translator\\testFiles\\", 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; void performTest(@NotNull Suite test, @NotNull String filename) throws Exception;
} }
} }