From 3f2e1bc1cef3699adf0172842e730b221fa9cb3b Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Fri, 3 Aug 2012 16:33:30 +0400
Subject: [PATCH] Move TEST_MODULE_NAME to Config and rename to
 REWRITABLE_MODULE_NAME.

---
 .../test/org/jetbrains/k2js/test/config/TestConfig.java      | 5 +----
 .../k2js/test/rhino/RhinoFunctionResultChecker.java          | 4 ++--
 js/js.translator/src/org/jetbrains/k2js/config/Config.java   | 5 +++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java b/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
index 188400bb9db..06f35bbfcae 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/config/TestConfig.java
@@ -41,9 +41,6 @@ public class TestConfig extends Config {
         }
     };
 
-    //NOTE: hard-coded in kotlin-lib files
-    @NotNull
-    public static final String TEST_MODULE_NAME = "JS_TESTS";
     @NotNull
     private final List<JetFile> jsLibFiles;
     @NotNull
@@ -51,7 +48,7 @@ public class TestConfig extends Config {
 
     public TestConfig(@NotNull Project project, @NotNull EcmaVersion version,
             @NotNull List<JetFile> files, @NotNull BindingContext context) {
-        super(project, TEST_MODULE_NAME, version);
+        super(project, REWRITABLE_MODULE_NAME, version);
         jsLibFiles = files;
         libraryContext = context;
     }
diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java
index f610cc984d3..5917ff76149 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoFunctionResultChecker.java
@@ -17,7 +17,7 @@
 package org.jetbrains.k2js.test.rhino;
 
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.test.config.TestConfig;
+import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.translate.context.Namer;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
@@ -36,7 +36,7 @@ public class RhinoFunctionResultChecker implements RhinoResultChecker {
     private final Object expectedResult;
 
     public RhinoFunctionResultChecker(@Nullable String namespaceName, String functionName, Object expectedResult) {
-        this(TestConfig.TEST_MODULE_NAME, namespaceName, functionName, expectedResult);
+        this(Config.REWRITABLE_MODULE_NAME, namespaceName, functionName, expectedResult);
     }
 
     public RhinoFunctionResultChecker(@Nullable String moduleId, @Nullable String namespaceName, String functionName, Object expectedResult) {
diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index dd815eb0b02..c0a12bcd31b 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -37,6 +37,11 @@ import java.util.List;
  */
 public abstract class Config {
 
+    //NOTE: hard-coded in kotlin-lib files
+    //NOTE: a hacky solution to be able to rerun code samples with lib loaded only once: used by tests and web demo
+    @NotNull
+    public static final String REWRITABLE_MODULE_NAME = "JS_TESTS";
+
     @NotNull
     public static Config getEmptyConfig(@NotNull Project project, @NotNull EcmaVersion ecmaVersion) {
         return new Config(project, "main", ecmaVersion) {