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

js: rename "anonymous" ns to "root"

Browse Source 
also use constant field instead of hardcoded literal in tests
This commit is contained in:
Stepan Koltsov
2012-04-09 22:31:41 +04:00
parent 74233edafc
commit a034eefb51
7 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoSystemOutputChecker.java
+2 -1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.k2js.test.rhino;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.translate.context.Namer;
import org.jetbrains.k2js.utils.GenerationUtils;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
@@ -58,7 +59,7 @@ public final class RhinoSystemOutputChecker implements RhinoResultChecker {
}
private void runMain(Context context, Scriptable scope) {
String callToMain = GenerationUtils.generateCallToMain("Anonymous", arguments);
String callToMain = GenerationUtils.generateCallToMain(Namer.getRootNamespaceName(), arguments);
context.evaluateString(scope, callToMain, "function call", 0, null);
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/ExamplesTest.java
+2 -1
View File
@@ -20,6 +20,7 @@ import junit.framework.Test;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.k2js.test.BasicTest;
import org.jetbrains.k2js.test.SingleFileTranslationTest;
import org.jetbrains.k2js.translate.context.Namer;
@SuppressWarnings("JUnitTestCaseWithNoTests")
public final class ExamplesTest extends SingleFileTranslationTest {
@@ -35,7 +36,7 @@ public final class ExamplesTest extends SingleFileTranslationTest {
@Override
public void runTest() throws Exception {
runFunctionOutputTest(filename, "Anonymous", "box", "OK");
runFunctionOutputTest(filename, Namer.getRootNamespaceName(), "box", "OK");
}
public static Test suite() throws Exception {
js/js.tests/test/org/jetbrains/k2js/test/semantics/FunctionTest.java
+3 -1
View File
@@ -16,6 +16,8 @@
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.translate.context.Namer;
/**
* @author Pavel Talanov
*/
@@ -58,7 +60,7 @@ public class FunctionTest extends AbstractExpressionTest {
}
public void testEnclosingThis() throws Exception {
runFunctionOutputTest("enclosingThis.kt", "Anonymous", "box", "OK");
runFunctionOutputTest("enclosingThis.kt", Namer.getRootNamespaceName(), "box", "OK");
}
js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java
+2 -1
View File
@@ -16,6 +16,7 @@
package org.jetbrains.k2js.test.semantics;
import org.jetbrains.k2js.translate.context.Namer;
import org.mozilla.javascript.JavaScriptException;
/**
@@ -45,7 +46,7 @@ public final class MiscTest extends AbstractExpressionTest {
}
public void testClassWithoutNamespace() throws Exception {
runFunctionOutputTest("classWithoutNamespace.kt", "Anonymous", "box", true);
runFunctionOutputTest("classWithoutNamespace.kt", Namer.getRootNamespaceName(), "box", true);
}
public void testIfElseAsExpressionWithThrow() throws Exception {