From 6cd409d37955ef0f7b31804254152962510722b7 Mon Sep 17 00:00:00 2001
From: Sergey Igushkin <sergey.igushkin@jetbrains.com>
Date: Fri, 11 Aug 2017 19:56:20 +0300
Subject: [PATCH] Fix tests assuming '_main' in default module names

---
 .../jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt    | 8 ++++----
 .../org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt   | 4 ++--
 .../testProject/kotlin2JsInternalTest/build.gradle        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
index 25f4d5d4c2a..5bfdd5d2be8 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
@@ -68,8 +68,8 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
             val jarPath = "build/libs/kotlin2JsNoOutputFileProject.jar"
             assertFileExists(jarPath)
             val jar = ZipFile(fileInWorkingDir(jarPath))
-            assertEquals(1, jar.entries().asSequence().count { it.name == "kotlin2JsNoOutputFileProject_main.js" },
-                         "The jar should contain an entry `kotlin2JsNoOutputFileProject_main.js` with no duplicates")
+            assertEquals(1, jar.entries().asSequence().count { it.name == "kotlin2JsNoOutputFileProject.js" },
+                         "The jar should contain an entry `kotlin2JsNoOutputFileProject.js` with no duplicates")
         }
     }
 
@@ -104,7 +104,7 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
 
         project.build("build") {
             assertSuccessful()
-            assertFileExists("build/classes/main/kotlin2JsNoOutputFileProject_main.js")
+            assertFileExists("build/classes/main/kotlin2JsNoOutputFileProject.js")
             assertFileExists("build/classes/test/kotlin2JsNoOutputFileProject_test.js")
         }
     }
@@ -205,7 +205,7 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
         project.build("build") {
             assertSuccessful()
 
-            val mapFilePath = "app/build/classes/main/app_main.js.map"
+            val mapFilePath = "app/build/classes/main/app.js.map"
             assertFileExists(mapFilePath)
             val map = fileInWorkingDir(mapFilePath).readText()
 
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
index 087a5f09f5c..6ef3b6c5048 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
@@ -80,7 +80,7 @@ class KotlinGradleIT: BaseGradleIT() {
 
         project.build("build") {
             assertSuccessful()
-            assertFileExists("build/classes/main/META-INF/kotlinProject_main.kotlin_module")
+            assertFileExists("build/classes/main/META-INF/kotlinProject.kotlin_module")
             assertReportExists()
             assertContains(":compileKotlin", ":compileTestKotlin")
             assertNotContains("Forcing System.gc")
@@ -388,7 +388,7 @@ class KotlinGradleIT: BaseGradleIT() {
             assertFileExists("lib/build/classes/test/foo/PlatformTest.kotlin_metadata")
             assertFileExists("libJvm/build/classes/main/foo/PlatformClass.class")
             assertFileExists("libJvm/build/classes/test/foo/PlatformTest.class")
-            assertFileExists("libJs/build/classes/main/libJs_main.js")
+            assertFileExists("libJs/build/classes/main/libJs.js")
             assertFileExists("libJs/build/classes/test/libJs_test.js")
         }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle
index fa41783cb21..fdc12485ec3 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle
@@ -24,7 +24,7 @@ task runRhino(type: JavaExec) {
     classpath = sourceSets.main.runtimeClasspath
     workingDir = "${buildDir}/classes/"
     main = 'org.mozilla.javascript.tools.shell.Main'
-    args = ["-opt", "-1", "-f", "kotlin.js", "-f", "main/kotlin2JsInternalTest_main.js", "-f", "test/kotlin2JsInternalTest_test.js", "-f", "check.js"]
+    args = ["-opt", "-1", "-f", "kotlin.js", "-f", "main/kotlin2JsInternalTest.js", "-f", "test/kotlin2JsInternalTest_test.js", "-f", "check.js"]
 }
 
 build.doLast {