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

[Gradle, JS] Remove dukat tests

Browse Source
This commit is contained in:
Ilya Goncharov
2022-10-03 15:49:17 +02:00
committed by Space Team
parent c7fff95231
commit a24d5af9c2
16 changed files with 0 additions and 709 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/ConfigurationCacheIT.kt
-34
View File
@@ -9,7 +9,6 @@ import org.gradle.api.logging.LogLevel
import org.gradle.api.logging.configuration.WarningMode import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.report.BuildReportType import org.jetbrains.kotlin.gradle.report.BuildReportType
import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat
import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.testbase.*
import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.HostManager
import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.DisplayName
@@ -211,39 +210,6 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() {
} }
} }
@JsGradlePluginTests
@DisplayName("works with Dukat")
@GradleTest
fun testConfigurationCacheDukatSrc(gradleVersion: GradleVersion) {
testConfigurationCacheDukat(gradleVersion)
}
@JsGradlePluginTests
@DisplayName("works with Dukat binaries")
@GradleTest
fun testConfigurationCacheDukatBinaries(gradleVersion: GradleVersion) {
testConfigurationCacheDukat(gradleVersion) {
gradleProperties.modify {
"""
${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.BINARY}
""".trimIndent()
}
}
}
private fun testConfigurationCacheDukat(
gradleVersion: GradleVersion,
configure: TestProject.() -> Unit = {}
) = project("dukat-integration/both", gradleVersion) {
buildGradleKts.modify(::transformBuildScriptWithPluginsDsl)
configure(this)
testConfigurationCacheOf(
"irGenerateExternalsIntegrated",
executedTaskNames = listOf(":irGenerateExternalsIntegrated")
)
}
@MppGradlePluginTests @MppGradlePluginTests
@DisplayName("works in MPP withJava project") @DisplayName("works in MPP withJava project")
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0, maxVersion = TestVersions.Gradle.G_7_1) @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0, maxVersion = TestVersions.Gradle.G_7_1)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DukatIntegrationIT.kt
-453
View File
@@ -1,453 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.gradle
import com.google.gson.Gson
import org.gradle.api.logging.configuration.WarningMode
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.targets.js.dukat.ExternalsOutputFormat
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson
import org.jetbrains.kotlin.gradle.testbase.*
import org.junit.jupiter.api.DisplayName
import kotlin.io.path.readText
@DisplayName("Dukat standalone")
@JsGradlePluginTests
class DukatIntegrationStandaloneIT : KGPBaseTest() {
@DisplayName("Kotlin DSL and root dependencies")
@GradleTest
fun testSeparateDukatKotlinDslRootDependencies(gradleVersion: GradleVersion) {
testSeparateDukat(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.ROOT
)
}
@DisplayName("Kotlin DSL and external dependencies")
@GradleTest
fun testSeparateDukatKotlinDslExtDependencies(gradleVersion: GradleVersion) {
testSeparateDukat(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.EXTENSION
)
}
@DisplayName("Groovy DSL and root dependencies")
@GradleTest
fun testSeparateDukatGroovyDslRootDependencies(gradleVersion: GradleVersion) {
testSeparateDukat(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.ROOT
)
}
@DisplayName("Groovy DSL and external dependencies")
@GradleTest
fun testSeparateDukatGroovyDslExtDependencies(gradleVersion: GradleVersion) {
testSeparateDukat(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.EXTENSION
)
}
private fun testSeparateDukat(
gradleVersion: GradleVersion,
dslType: DslType,
dependenciesLocation: DependenciesLocation
) {
project(
projectName = projectName(dslType, dependenciesLocation, PROJECTS_PREFIX),
gradleVersion
) {
build("generateExternals")
}
}
}
@DisplayName("Dukat integrated")
@JsGradlePluginTests
class DukatIntegratedIntegrationIT : KGPBaseTest() {
@DisplayName("Kotlin DSL and root dependencies")
@GradleTest
fun testIntegratedDukatKotlinDslRootDependencies(gradleVersion: GradleVersion) {
testIntegratedDukat(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.ROOT
)
}
@DisplayName("Kotlin DSL and external dependencies")
@GradleTest
fun testIntegratedDukatKotlinDslExtDependencies(gradleVersion: GradleVersion) {
testIntegratedDukat(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.EXTENSION
)
}
@DisplayName("Groovy DSL and root dependencies")
@GradleTest
fun testIntegratedDukatGroovyDslRootDependencies(gradleVersion: GradleVersion) {
testIntegratedDukat(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.ROOT
)
}
@DisplayName("Groovy DSL and external dependencies")
@GradleTest
fun testIntegratedDukatGroovyDslExtDependencies(gradleVersion: GradleVersion) {
testIntegratedDukat(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.EXTENSION
)
}
private fun testIntegratedDukat(
gradleVersion: GradleVersion,
dslType: DslType,
dependenciesLocation: DependenciesLocation
) {
project(
projectName = projectName(dslType, dependenciesLocation, PROJECTS_PREFIX),
gradleVersion
) {
gradleProperties.modify {
"${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}"
}
build("compileKotlinJs") {
assertFileInProjectExists("build/externals/${projectName(dslType, dependenciesLocation)}/src/index.module_decamelize.kt")
}
}
}
@DisplayName("Kotlin DSL: change in root dependencies")
@GradleTest
fun testIntegratedDukatWithChangeKotlinDslRootDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithChange(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.ROOT
)
}
@DisplayName("Kotlin DSL: change in external dependencies")
@GradleTest
fun testIntegratedDukatWithChangeKotlinDslExtDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithChange(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.EXTENSION
)
}
@DisplayName("Groovy DSL: change in root dependencies")
@GradleTest
fun testIntegratedDukatWithChangeGroovyDslRootDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithChange(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.ROOT
)
}
@DisplayName("Groovy DSL: change in external dependencies")
@GradleTest
fun testIntegratedDukatWithChangeGroovyDslExtDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithChange(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.EXTENSION
)
}
private fun testIntegratedDukatWithChange(
gradleVersion: GradleVersion,
dslType: DslType,
dependenciesLocation: DependenciesLocation
) {
project(
projectName = projectName(dslType, dependenciesLocation, PROJECTS_PREFIX),
gradleVersion
) {
gradleProperties.modify {
"${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}"
}
val externalSrcs = "build/externals/${projectName(dslType, dependenciesLocation)}/src"
build("compileKotlinJs") {
assertFileInProjectExists("$externalSrcs/index.module_decamelize.kt")
}
buildFileForDslType(dslType).modify { buildScript ->
buildScript
.replace(
"""implementation(npm("left-pad", "1.3.0"))""",
"""implementation(npm("left-pad", "1.3.0", true))"""
)
.replace(
"""implementation(npm("decamelize", "4.0.0", true))""",
"""implementation(npm("decamelize", "4.0.0"))"""
)
}
build("generateExternalsIntegrated") {
assertFileInProjectExists("$externalSrcs/index.module_left-pad.kt")
}
}
}
@DisplayName("Kotlin DSL: with false default root dependencies")
@GradleTest
fun testIntegratedDukatWithFalseDefaultKotlinDslRootDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithFalseDefault(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.ROOT
)
}
@DisplayName("Kotlin DSL: with false external dependencies")
@GradleTest
fun testIntegratedDukatWithFalseDefaultKotlinDslExtDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithFalseDefault(
gradleVersion,
DslType.KOTLIN,
DependenciesLocation.EXTENSION
)
}
@DisplayName("Groovy DSL: with false root dependencies")
@GradleTest
fun testIntegratedDukatWithFalseDefaultGroovyDslRootDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithFalseDefault(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.ROOT
)
}
@DisplayName("Groovy DSL: with false external dependencies")
@GradleTest
fun testIntegratedDukatWithFalseDefaultGroovyDslExtDependencies(gradleVersion: GradleVersion) {
testIntegratedDukatWithFalseDefault(
gradleVersion,
DslType.GROOVY,
DependenciesLocation.EXTENSION
)
}
private fun testIntegratedDukatWithFalseDefault(
gradleVersion: GradleVersion,
dslType: DslType,
dependenciesLocation: DependenciesLocation
) {
project(
projectName = projectName(dslType, dependenciesLocation, PROJECTS_PREFIX),
gradleVersion
) {
gradleProperties.modify {
"""
kotlin.js.generate.externals=true
${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}
""".trimIndent()
}
buildFileForDslType(dslType).modify { buildScript ->
buildScript
.replace(
"""implementation(npm("decamelize", "4.0.0", true))""",
"""implementation(npm("decamelize", "4.0.0", false))"""
)
}
val externalSrcs = "build/externals/${projectName(dslType, dependenciesLocation)}/src"
build("generateExternalsIntegrated") {
assertFileInProjectExists("$externalSrcs/index.module_left-pad.kt")
}
}
}
}
@DisplayName("Dukat in js BOTH mode")
@JsGradlePluginTests
class DukatIntegrationBothModeIT : KGPBaseTest() {
@DisplayName("Dependencies are generated only once")
@GradleTest
fun testBothOnlyOnceGenerateDependencies(gradleVersion: GradleVersion) {
project("dukat-integration/both", gradleVersion) {
gradleProperties.modify {
"${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}"
}
val externalSrcs = "build/externals/both-js-ir/src"
build("compileKotlinJsLegacy") {
assertTasksExecuted(":irGenerateExternalsIntegrated")
assertFileInProjectExists("$externalSrcs/index.module_decamelize.kt")
val legacyExternals = projectPath.resolve("build/externals/both-js-legacy/src")
assertFileNotExists(legacyExternals)
}
build(
"compileKotlinJsLegacy",
"--rerun-tasks"
) {
assertTasksExecuted(":irGenerateExternalsIntegrated")
assertFileInProjectExists("$externalSrcs/index.module_decamelize.kt")
}
}
}
@DisplayName("Groovy DSL: compilation")
@GradleTest
fun testCompilationLegacyBinariesGroovyDsl(gradleVersion: GradleVersion) {
testCompilationLegacyBinaries(
gradleVersion,
DslType.GROOVY
)
}
@DisplayName("Kotlin DSL: compilation")
@GradleTest
fun testCompilationLegacyBinariesKotlinDsl(gradleVersion: GradleVersion) {
testCompilationLegacyBinaries(
gradleVersion,
DslType.KOTLIN
)
}
private fun testCompilationLegacyBinaries(
gradleVersion: GradleVersion,
dslType: DslType
) {
project(
projectName(dslType, DependenciesLocation.EXTENSION, PROJECTS_PREFIX),
gradleVersion
) {
build("compileKotlinJs")
}
}
@DisplayName("Assemble both binaries")
@GradleTest
fun testAssembleBothBinaries(gradleVersion: GradleVersion) {
project("${PROJECTS_PREFIX}/both", gradleVersion) {
// Warning mode 'Summary' because
// > Execution optimizations have been disabled for task ':kotlinSourcesJar' to ensure correctness due to the following reasons
build(
"assemble",
buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Summary)
)
}
}
@DisplayName("Compile both binaries in legacy mode")
@GradleTest
fun testCompileLegacyBothBinaries(gradleVersion: GradleVersion) {
project("$PROJECTS_PREFIX/both", gradleVersion) {
gradleProperties.modify {
"""
${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.BINARY}
""".trimIndent()
}
val externalSrcs = "build/externals/both-js-legacy/src"
build("compileKotlinJsLegacy") {
assertFileInProjectExists("$externalSrcs/index.d.jar")
val irExternals = "build/externals/both-js-ir/src"
assertFileInProjectNotExists(irExternals)
}
}
}
@DisplayName("Assemble both sources")
@GradleTest
fun testAssembleBothSource(gradleVersion: GradleVersion) {
project("$PROJECTS_PREFIX/both", gradleVersion) {
gradleProperties.modify {
"""
${ExternalsOutputFormat.externalsOutputFormatProperty}=${ExternalsOutputFormat.SOURCE}
""".trimIndent()
}
val externalSrcs = "build/externals/both-js-ir/src"
build("assemble", buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Summary)) {
assertTasksExecuted(":irGenerateExternalsIntegrated")
assertFileInProjectExists("$externalSrcs/index.module_decamelize.kt")
val legacyExternals = "build/externals/both-js-legacy/src"
assertFileInProjectNotExists(legacyExternals)
}
}
}
@DisplayName("Without generating externals")
@GradleTest
fun testWithoutGenerateExternals(gradleVersion: GradleVersion) {
project("$PROJECTS_PREFIX/without-generate-externals", gradleVersion) {
build("assemble", buildOptions = defaultBuildOptions.copy(warningMode = WarningMode.Summary)) {
assertTasksSkipped(":generateExternalsIntegrated")
assert(
!projectPath
.resolve("build/js/packages/without-generate-externals")
.resolve(NpmProject.PACKAGE_JSON)
.let {
Gson().fromJson(it.readText(), PackageJson::class.java)
}
.dependencies
.containsKey("dukat")
) {
"Dukat don't need to be dependency for thus project"
}
}
}
}
}
private fun projectName(
dslType: DslType,
dependenciesLocation: DependenciesLocation,
directoryPrefix: String = ""
): String =
"$directoryPrefix/${dslType.value}-${dependenciesLocation.value}"
private enum class DslType(
val value: String
) {
KOTLIN("kotlin-dsl"),
GROOVY("groovy-dsl")
}
private enum class DependenciesLocation(
val value: String
) {
ROOT("root"),
EXTENSION("ext")
}
private fun TestProject.buildFileForDslType(dslType: DslType) =
when (dslType) {
DslType.KOTLIN -> buildGradleKts
DslType.GROOVY -> buildGradle
}
private const val PROJECTS_PREFIX = "dukat-integration"
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsLibraryGradlePluginIT.kt
-14
View File
@@ -76,18 +76,4 @@ class KotlinJsIrLibraryGradlePluginIT : KGPBaseTest() {
} }
} }
} }
@DisplayName("publish sources jar task should also include dukat outputs")
@GradleTest
fun testPublishSourcesJarTaskShouldAlsoIncludeDukatTaskOutputs(gradleVersion: GradleVersion) {
project("js-library-ir", gradleVersion) {
build("jsSourcesJar") {
val sourcesJarFilePath = "build/libs/js-library-ir-js-sources.jar"
assertFileInProjectExists(sourcesJarFilePath)
ZipFile(projectPath.resolve(sourcesJarFilePath).toFile()).use {
assertNotNull(it.getEntry("jsMain/index.module_decamelize.kt"))
}
}
}
}
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/both/build.gradle.kts
-20
View File
@@ -1,20 +0,0 @@
plugins {
kotlin("js")
}
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
implementation(kotlin("stdlib-js"))
implementation(npm("decamelize", "4.0.0", true))
}
kotlin {
js(BOTH) {
useCommonJs()
nodejs()
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/both/src/main/kotlin/main.kt
-3
View File
@@ -1,3 +0,0 @@
fun main() {
decamelize("helloWorld")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-ext/build.gradle
-25
View File
@@ -1,25 +0,0 @@
plugins {
id("org.jetbrains.kotlin.js")
}
repositories {
mavenLocal()
mavenCentral()
}
kotlin {
js {
useCommonJs()
nodejs()
}
sourceSets {
main {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-js")
implementation(npm("left-pad", "1.3.0"))
implementation(npm("decamelize", "4.0.0", true))
}
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-ext/src/main/kotlin/main.kt
-3
View File
@@ -1,3 +0,0 @@
fun main() {
decamelize("helloWorld")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/groovy-dsl-root/build.gradle
-21
View File
@@ -1,21 +0,0 @@
plugins {
id("org.jetbrains.kotlin.js")
}
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-js")
implementation(npm("left-pad", "1.3.0"))
implementation(npm("decamelize", "4.0.0", true))
}
kotlin {
js {
useCommonJs()
nodejs()
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-ext/build.gradle.kts
-25
View File
@@ -1,25 +0,0 @@
plugins {
kotlin("js")
}
repositories {
mavenLocal()
mavenCentral()
}
kotlin {
js {
useCommonJs()
nodejs()
}
sourceSets {
val main by getting {
dependencies {
implementation(kotlin("stdlib-js"))
implementation(npm("left-pad", "1.3.0"))
implementation(npm("decamelize", "4.0.0", true))
}
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-ext/src/main/kotlin/main.kt
-3
View File
@@ -1,3 +0,0 @@
fun main() {
decamelize("helloWorld")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/kotlin-dsl-root/build.gradle.kts
-21
View File
@@ -1,21 +0,0 @@
plugins {
kotlin("js")
}
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
implementation(kotlin("stdlib-js"))
implementation(npm("left-pad", "1.3.0"))
implementation(npm("decamelize", "4.0.0", true))
}
kotlin {
js {
useCommonJs()
nodejs()
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/dukat-integration/without-generate-externals/build.gradle.kts
-21
View File
@@ -1,21 +0,0 @@
plugins {
kotlin("js")
}
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
implementation(kotlin("stdlib-js"))
implementation(npm("left-pad", "1.3.0"))
implementation(npm("decamelize", "4.0.0"))
}
kotlin {
js {
useCommonJs()
nodejs()
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir-validate-ts/build.gradle.kts
-28
View File
@@ -1,28 +0,0 @@
plugins {
kotlin("multiplatform")
`maven-publish`
}
repositories {
mavenLocal()
mavenCentral()
}
kotlin {
js(IR) {
browser {
commonWebpackConfig {
cssSupport {
enabled = true
}
scssSupport {
enabled = true
}
}
}
}
}
dependencies {
"jsMainImplementation"(npm("decamelize", "4.0.0", generateExternals = true))
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir-validate-ts/src/jsMain/main.kt
-5
View File
@@ -1,5 +0,0 @@
package example
fun main() {
println("Hello there!")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir/build.gradle.kts
-28
View File
@@ -1,28 +0,0 @@
plugins {
kotlin("multiplatform")
`maven-publish`
}
repositories {
mavenLocal()
mavenCentral()
}
kotlin {
js(IR) {
browser {
commonWebpackConfig {
cssSupport {
enabled.set(true)
}
scssSupport {
enabled.set(true)
}
}
}
}
}
dependencies {
"jsMainImplementation"(npm("decamelize", "4.0.0", generateExternals = true))
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/js-library-ir/src/jsMain/main.kt
-5
View File
@@ -1,5 +0,0 @@
package example
fun main() {
println("Hello there!")
}