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

Fix JS stdlib file names in KotlinJpsBuildTest

Browse Source 
Add "kotlin-experimental.js", "kotlin-experimental.meta.js" and refactor
surroundings
This commit is contained in:
Alexander Udalov
2018-02-16 16:52:00 +01:00
parent d732f0e160
commit 96e33dabcf
1 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+10 -12
View File
@@ -92,20 +92,22 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
private val KOTLIN_JS_LIBRARY = "jslib-example" private val KOTLIN_JS_LIBRARY = "jslib-example"
private val PATH_TO_KOTLIN_JS_LIBRARY = AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY private val PATH_TO_KOTLIN_JS_LIBRARY = AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY
private val KOTLIN_JS_LIBRARY_JAR = "$KOTLIN_JS_LIBRARY.jar" private val KOTLIN_JS_LIBRARY_JAR = "$KOTLIN_JS_LIBRARY.jar"
private val STDLIB_JS_FILES = hashSetOf(
"lib/kotlin.js",
"lib/kotlin.meta.js",
"lib/kotlin-experimental.js",
"lib/kotlin-experimental.meta.js"
)
private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = hashSetOf( private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = hashSetOf(
"$PROJECT_NAME.js", "$PROJECT_NAME.js",
"$PROJECT_NAME.meta.js", "$PROJECT_NAME.meta.js",
"lib/kotlin.js",
"lib/kotlin.meta.js",
"$PROJECT_NAME/root-package.kjsm" "$PROJECT_NAME/root-package.kjsm"
) ) + STDLIB_JS_FILES
private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = hashSetOf( private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = hashSetOf(
"$ADDITIONAL_MODULE_NAME.js", "$ADDITIONAL_MODULE_NAME.js",
"$ADDITIONAL_MODULE_NAME.meta.js", "$ADDITIONAL_MODULE_NAME.meta.js",
"lib/kotlin.js",
"lib/kotlin.meta.js",
"$ADDITIONAL_MODULE_NAME/module2/module2.kjsm" "$ADDITIONAL_MODULE_NAME/module2/module2.kjsm"
) ) + STDLIB_JS_FILES
private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf( private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf(
"$PROJECT_NAME.js", "$PROJECT_NAME.js",
"$PROJECT_NAME.meta.js", "$PROJECT_NAME.meta.js",
@@ -114,8 +116,6 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf( private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf(
"$PROJECT_NAME.js", "$PROJECT_NAME.js",
"$PROJECT_NAME.meta.js", "$PROJECT_NAME.meta.js",
"lib/kotlin.js",
"lib/kotlin.meta.js",
"lib/jslib-example.js", "lib/jslib-example.js",
"lib/jslib-example.meta.js", "lib/jslib-example.meta.js",
"lib/file0.js", "lib/file0.js",
@@ -124,12 +124,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
"lib/res0.js", "lib/res0.js",
"lib/resdir/res1.js", "lib/resdir/res1.js",
"$PROJECT_NAME/root-package.kjsm" "$PROJECT_NAME/root-package.kjsm"
) ) + STDLIB_JS_FILES
private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = hashSetOf( private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = hashSetOf(
"$PROJECT_NAME.js", "$PROJECT_NAME.js",
"$PROJECT_NAME.meta.js", "$PROJECT_NAME.meta.js",
"custom/kotlin.js",
"custom/kotlin.meta.js",
"custom/jslib-example.js", "custom/jslib-example.js",
"custom/jslib-example.meta.js", "custom/jslib-example.meta.js",
"custom/file0.js", "custom/file0.js",
@@ -138,7 +136,7 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
"custom/res0.js", "custom/res0.js",
"custom/resdir/res1.js", "custom/resdir/res1.js",
"$PROJECT_NAME/root-package.kjsm" "$PROJECT_NAME/root-package.kjsm"
) ) + STDLIB_JS_FILES.map { it.replace("lib", "custom") }
private fun k2jsOutput(vararg moduleNames: String): Array<String> { private fun k2jsOutput(vararg moduleNames: String): Array<String> {
val list = arrayListOf<String>() val list = arrayListOf<String>()