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

Fix tests assuming '_main' in default module names

Browse Source
This commit is contained in:
Sergey Igushkin
2017-08-11 19:56:20 +03:00
parent 80131d8359
commit 6cd409d379
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+4 -4
View File
@@ -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()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+2 -2
View File
@@ -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")
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin2JsInternalTest/build.gradle
+1 -1
View File
@@ -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 {