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

KJS: introduce $kotlin_test_internal$ to expose some helper functions in the tests

Browse Source
This commit is contained in:
Zalim Bashorov
2017-01-17 22:46:56 +03:00
parent bbd69a05dc
commit ca2930600a
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+4 -2
View File
@@ -228,9 +228,9 @@ abstract class BasicBoxTest(
if (config.moduleKind == ModuleKind.COMMON_JS) {
val content = FileUtil.loadFile(outputFile, true)
val wrappedContent = "__beginModule__();\n" +
val wrappedContent = "$KOTLIN_TEST_INTERNAL.beginModule();\n" +
"$content\n" +
"__endModule__(\"${StringUtil.escapeStringCharacters(config.moduleId)}\");"
"$KOTLIN_TEST_INTERNAL.endModule(\"${StringUtil.escapeStringCharacters(config.moduleId)}\");"
FileUtil.writeToFile(outputFile, wrappedContent)
}
@@ -337,5 +337,7 @@ abstract class BasicBoxTest(
private val NO_MODULE_SYSTEM_PATTERN = Pattern.compile("^// *NO_JS_MODULE_SYSTEM", Pattern.MULTILINE)
private val NO_INLINE_PATTERN = Pattern.compile("^// *NO_INLINE *$", Pattern.MULTILINE)
private val SKIP_NODE_JS = Pattern.compile("^// *SKIP_NODE_JS *$", Pattern.MULTILINE)
const val KOTLIN_TEST_INTERNAL = "\$kotlin_test_internal\$"
}
}
js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoFunctionResultChecker.java
+2 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.js.test.rhino;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.js.test.BasicBoxTest;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Scriptable;
@@ -70,7 +71,7 @@ public class RhinoFunctionResultChecker implements RhinoResultChecker {
StringBuilder sb = new StringBuilder();
if (withModuleSystem) {
sb.append("require('").append(moduleId).append("')");
sb.append(BasicBoxTest.KOTLIN_TEST_INTERNAL).append(".require('").append(moduleId).append("')");
}
else if (moduleId.contains(".")) {
sb.append("this['").append(moduleId).append("']");