From e0eea15a4c459f4a6480da6683bb8357c5388a69 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Fri, 13 Oct 2017 12:44:54 +0300 Subject: [PATCH] Fix JS tests failing on Windows --- compiler/testData/cli/js/sourceMapCharEscape.test | 2 +- compiler/testData/cli/js/sourceMapEmbedSources.test | 3 ++- .../org/jetbrains/kotlin/test/KotlinTestUtils.java | 1 + .../src/it/test-js-sourceMapEmbedSources/verify.bsh | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/compiler/testData/cli/js/sourceMapCharEscape.test b/compiler/testData/cli/js/sourceMapCharEscape.test index 19f6cbe5320..50967e8fe84 100644 --- a/compiler/testData/cli/js/sourceMapCharEscape.test +++ b/compiler/testData/cli/js/sourceMapCharEscape.test @@ -1,2 +1,2 @@ // EXISTS: out.js -// CONTAINS: out.js.map, \"©∑\\n\"\n +// CONTAINS: out.js.map, \"©∑\\n\" diff --git a/compiler/testData/cli/js/sourceMapEmbedSources.test b/compiler/testData/cli/js/sourceMapEmbedSources.test index d879fb77ec6..b6b863774fd 100644 --- a/compiler/testData/cli/js/sourceMapEmbedSources.test +++ b/compiler/testData/cli/js/sourceMapEmbedSources.test @@ -1,3 +1,4 @@ // EXISTS: out.js // CONTAINS: out.js.map, "./sourceMap.kt" -// CONTAINS: out.js.map, "var log = \"\"\n\nfun foo(x: String) { +// CONTAINS: out.js.map, "var log = \"\" +// CONTAINS: out.js.map, fun foo(x: String) { diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index 60c8ff37a7c..38cf5895ba2 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -718,6 +718,7 @@ public class KotlinTestUtils { String moduleDependencies = matcher.group(2); String moduleFriends = matcher.group(3); if (moduleName != null) { + moduleName = moduleName.trim(); hasModules = true; module = factory.createModule(moduleName, parseModuleList(moduleDependencies), parseModuleList(moduleFriends)); } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh index 3e9584a11e8..2e8d9bd3d2e 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-js-sourceMapEmbedSources/verify.bsh @@ -1,4 +1,5 @@ source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"org/jetbrains/HelloWorld.kt\""); -assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"package org.jetbrains\\n\\nfun bar() = \\\"OK\\\""); +assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "\"package org.jetbrains"); +assertFileContains("target/js/test-js-sourceMapEmbedSources.js.map", "fun bar() = \\\"OK\\\"")