From c7ab333fa8e514ae0b24219f3b5e875b612f88c5 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 18 Mar 2015 21:19:02 +0300 Subject: [PATCH] JPS test data fixed for JS --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 6feab40c392..5131a3f8caf 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -56,11 +56,20 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String KOTLIN_JS_LIBRARY = "jslib-example"; private static final String PATH_TO_KOTLIN_JS_LIBRARY = TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY; private static final String KOTLIN_JS_LIBRARY_JAR = KOTLIN_JS_LIBRARY + ".jar"; - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js", "lib/kotlin.js", "lib/stdlib.meta.js"); - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js"); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf( + PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js", + "lib/kotlin.js", + "lib/stdlib.meta.js" + ); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf( + PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js" + ); private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = KotlinPackage.hashSetOf( PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js", "lib/kotlin.js", "lib/stdlib.meta.js", "lib/jslib-example.js", @@ -72,6 +81,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = KotlinPackage.hashSetOf( PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js", "custom/kotlin.js", "custom/stdlib.meta.js", "custom/jslib-example.js",