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

[Gradle, JS] Fix tests with decamelizing names

Browse Source 
^KT-43237 fixed
This commit is contained in:
Ilya Goncharov
2020-12-24 13:47:34 +03:00
parent 0bd4de65e1
commit 2ce51a4c11
2 changed files with 9 additions and 9 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/DukatIntegrationIT.kt
+6 -6
View File
@@ -266,13 +266,13 @@ class DukatIntegrationIT : BaseGradleIT() {
"${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}" "${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}"
} }
val externalSrcs = "build/externals/both-jsIr/src" val externalSrcs = "build/externals/both-js-ir/src"
project.build("compileKotlinJsLegacy") { project.build("compileKotlinJsLegacy") {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":irGenerateExternalsIntegrated") assertTasksExecuted(":irGenerateExternalsIntegrated")
assertSingleFileExists(externalSrcs, "index.module_decamelize.kt") assertSingleFileExists(externalSrcs, "index.module_decamelize.kt")
val legacyExternals = "build/externals/both-jsLegacy/src" val legacyExternals = "build/externals/both-js-legacy/src"
val directoryFile = fileInWorkingDir(legacyExternals) val directoryFile = fileInWorkingDir(legacyExternals)
assertTrue( assertTrue(
!directoryFile.exists(), !directoryFile.exists(),
@@ -351,13 +351,13 @@ class DukatIntegrationIT : BaseGradleIT() {
""".trimIndent() """.trimIndent()
} }
val externalSrcs = "build/externals/both-jsLegacy/src" val externalSrcs = "build/externals/both-js-legacy/src"
project.build("compileKotlinJsLegacy") { project.build("compileKotlinJsLegacy") {
assertSuccessful() assertSuccessful()
assertSingleFileExists(externalSrcs, "index.d.jar") assertSingleFileExists(externalSrcs, "index.d.jar")
val irExternals = "build/externals/both-jsIr/src" val irExternals = "build/externals/both-js-ir/src"
val directoryFile = fileInWorkingDir(irExternals) val directoryFile = fileInWorkingDir(irExternals)
assertTrue( assertTrue(
!directoryFile.exists(), !directoryFile.exists(),
@@ -381,14 +381,14 @@ class DukatIntegrationIT : BaseGradleIT() {
""".trimIndent() """.trimIndent()
} }
val externalSrcs = "build/externals/both-jsIr/src" val externalSrcs = "build/externals/both-js-ir/src"
project.build("assemble", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) { project.build("assemble", options = defaultBuildOptions().copy(warningMode = WarningMode.Summary)) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":irGenerateExternalsIntegrated") assertTasksExecuted(":irGenerateExternalsIntegrated")
assertSingleFileExists(externalSrcs, "index.module_decamelize.kt") assertSingleFileExists(externalSrcs, "index.module_decamelize.kt")
val legacyExternals = "build/externals/both-jsLegacy/src" val legacyExternals = "build/externals/both-js-legacy/src"
val directoryFile = fileInWorkingDir(legacyExternals) val directoryFile = fileInWorkingDir(legacyExternals)
assertTrue( assertTrue(
!directoryFile.exists(), !directoryFile.exists(),
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+3 -3
View File
@@ -704,8 +704,8 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) :
assertTasksExecuted(":app:browserProductionWebpack") assertTasksExecuted(":app:browserProductionWebpack")
assertFileExists("build/js/packages/kotlin-js-browser-base-jsIr") assertFileExists("build/js/packages/kotlin-js-browser-base-js-ir")
assertFileExists("build/js/packages/kotlin-js-browser-base-jsLegacy") assertFileExists("build/js/packages/kotlin-js-browser-base-js-legacy")
assertFileExists("build/js/packages/kotlin-js-browser-lib") assertFileExists("build/js/packages/kotlin-js-browser-lib")
assertFileExists("build/js/packages/kotlin-js-browser-app") assertFileExists("build/js/packages/kotlin-js-browser-app")
@@ -719,7 +719,7 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) :
assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin.js") assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin.js")
assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-app.js") assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-app.js")
assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-lib.js") assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-lib.js")
assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-base-jsLegacy.js") assertFileExists("build/js/packages/kotlin-js-browser-app/kotlin-dce/kotlin-js-browser-base-js-legacy.js")
assertFileExists("app/build/distributions/app.js.map") assertFileExists("app/build/distributions/app.js.map")
} }