azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide string constant TEST_FILES.

Browse Source
This commit is contained in:
pTalanov
2012-03-02 19:11:57 +04:00
parent c38bf0bc86
commit 320ed18134
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+8 -3
View File
@@ -31,10 +31,10 @@ import static org.jetbrains.k2js.test.utils.JsTestUtils.convertToDotJsFile;
public abstract class BasicTest extends TestWithEnvironment { public abstract class BasicTest extends TestWithEnvironment {
private static final boolean DELETE_OUT = false; private static final boolean DELETE_OUT = false;
public static final String TEST_FILES = "js.translator/testFiles/"; private static final String TEST_FILES = "js.translator/testFiles/";
private static final String CASES = "cases/"; private static final String CASES = "cases/";
private static final String OUT = "out/"; private static final String OUT = "out/";
private static final String KOTLIN_JS_LIB = TEST_FILES + "kotlin_lib.js"; private static final String KOTLIN_JS_LIB = pathToTestFilesRoot() + "kotlin_lib.js";
private static final String EXPECTED = "expected/"; private static final String EXPECTED = "expected/";
@NotNull @NotNull
@@ -99,7 +99,12 @@ public abstract class BasicTest extends TestWithEnvironment {
@NotNull @NotNull
private String pathToTestFiles() { private String pathToTestFiles() {
return TEST_FILES + getMainDirectory(); return pathToTestFilesRoot() + getMainDirectory();
}
@NotNull
protected static String pathToTestFilesRoot() {
return TEST_FILES;
} }
private String getOutputPath() { private String getOutputPath() {
js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java
+1 -2
View File
@@ -55,12 +55,11 @@ public abstract class SuiteBuilder extends SingleFileTranslationTest {
} }
} }
public static Test suiteForDirectory(@NotNull final String main, @NotNull final SuiteBuilder.Tester testMethod) throws Exception { public static Test suiteForDirectory(@NotNull final String main, @NotNull final SuiteBuilder.Tester testMethod) throws Exception {
final SuiteBuilder singleFileTest = new SuiteBuilder(main) { final SuiteBuilder singleFileTest = new SuiteBuilder(main) {
}; };
singleFileTest.setUp(); singleFileTest.setUp();
return TranslatorTestCaseBuilder.suiteForDirectory(TEST_FILES + main + casesDirectoryName(), return TranslatorTestCaseBuilder.suiteForDirectory(pathToTestFilesRoot() + main + casesDirectoryName(),
true, true,
new TranslatorTestCaseBuilder.NamedTestFactory() { new TranslatorTestCaseBuilder.NamedTestFactory() {
@NotNull @NotNull