From 320ed181348329aed1f606c614e565746129b239 Mon Sep 17 00:00:00 2001
From: pTalanov <talanov.pavel@gmail.com>
Date: Fri, 2 Mar 2012 19:11:57 +0400
Subject: [PATCH] Hide string constant TEST_FILES.

---
 .../test/org/jetbrains/k2js/test/BasicTest.java       | 11 ++++++++---
 .../org/jetbrains/k2js/test/utils/SuiteBuilder.java   |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
index b95c496d422..ea5299bb2f3 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/BasicTest.java
@@ -31,10 +31,10 @@ import static org.jetbrains.k2js.test.utils.JsTestUtils.convertToDotJsFile;
 public abstract class BasicTest extends TestWithEnvironment {
 
     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 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/";
 
     @NotNull
@@ -99,7 +99,12 @@ public abstract class BasicTest extends TestWithEnvironment {
 
     @NotNull
     private String pathToTestFiles() {
-        return TEST_FILES + getMainDirectory();
+        return pathToTestFilesRoot() + getMainDirectory();
+    }
+
+    @NotNull
+    protected static String pathToTestFilesRoot() {
+        return TEST_FILES;
     }
 
     private String getOutputPath() {
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java b/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java
index 5d17e5ae1c3..fe352b0fb3b 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/utils/SuiteBuilder.java
@@ -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 {
         final SuiteBuilder singleFileTest = new SuiteBuilder(main) {
         };
         singleFileTest.setUp();
-        return TranslatorTestCaseBuilder.suiteForDirectory(TEST_FILES + main + casesDirectoryName(),
+        return TranslatorTestCaseBuilder.suiteForDirectory(pathToTestFilesRoot() + main + casesDirectoryName(),
                                                            true,
                                                            new TranslatorTestCaseBuilder.NamedTestFactory() {
                                                                @NotNull