From a05d49d27eee28fa006c889b298ebe81f1964202 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Wed, 4 Jan 2023 12:43:29 +0100 Subject: [PATCH] [Gradle, JS] Revert Gradle integration tests --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 4 +- .../gradle/KotlinJsDomApiDependencyIT.kt | 203 ------------------ 2 files changed, 2 insertions(+), 205 deletions(-) delete mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt 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 3c396b2e522..f3e6a641613 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 @@ -183,8 +183,8 @@ class Kotlin2JsIrGradlePluginIT : AbstractKotlin2JsGradlePluginIT(true) { } val cacheRootDir = cacheDir.resolve(cacheRootDirName!!) val klibCacheDirs = cacheRootDir.list() - // 2 for lib.klib + 1 for stdlib + 1 for dom-api + 1 for main - assertEquals(5, klibCacheDirs?.size, "cache should contain 4 dirs") + // 2 for lib.klib + 1 for stdlib + 1 for main + assertEquals(4, klibCacheDirs?.size, "cache should contain 4 dirs") val libKlibCacheDirs = klibCacheDirs?.filter { dir -> dir.startsWith("lib.klib.") } assertEquals(2, libKlibCacheDirs?.size, "cache should contain 2 dirs for lib.klib") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt deleted file mode 100644 index 0dd83c32f04..00000000000 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinJsDomApiDependencyIT.kt +++ /dev/null @@ -1,203 +0,0 @@ -/* - * Copyright 2010-2022 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 org.gradle.api.logging.configuration.WarningMode -import org.gradle.util.GradleVersion -import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType -import org.jetbrains.kotlin.gradle.testbase.* -import org.junit.jupiter.api.DisplayName - -@JsGradlePluginTests -class KotlinJsDomApiDependencyIT : KGPBaseTest() { - - private val defaultJsOptions = BuildOptions.JsOptions( - useIrBackend = true, - jsCompilerType = KotlinJsCompilerType.IR - ) - - override val defaultBuildOptions = - super.defaultBuildOptions.copy( - jsOptions = defaultJsOptions, - warningMode = WarningMode.Summary - ) - - @DisplayName("Kotlin/JS DOM API automatically added as dependency") - @GradleTest - fun testJsDomApiCompat(gradleVersion: GradleVersion) { - project("kotlin-js-dom-api-compat", gradleVersion) { - build("assemble") { - assertTasksExecuted(":compileKotlinJs") - } - - var added: String? = null - - buildGradleKts.modify { - it + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-js") - } - """.trimIndent().also { added = it } - } - - build("assemble") { - assertTasksUpToDate(":compileKotlinJs") - } - - buildGradleKts.modify { - val replaced = it.replace(added!!, "") - replaced + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-dom-api-compat") - } - """.trimIndent().also { added = it } - } - - build("assemble") { - assertTasksUpToDate(":compileKotlinJs") - } - - buildGradleKts.modify { - val replaced = it.replace(added!!, "") - replaced + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-js") - implementation("org.jetbrains.kotlin:kotlin-dom-api-compat") - } - """.trimIndent().also { added = it } - } - - build("assemble") { - assertTasksUpToDate(":compileKotlinJs") - } - } - } - - @DisplayName("Kotlin/JS DOM API automatically not added as dependency with disabled adding of stdlib") - @GradleTest - fun testJsDomApiCompatWithDisabledAddingStdlib(gradleVersion: GradleVersion) { - project("kotlin-js-dom-api-compat", gradleVersion) { - var added: String? = null - - gradleProperties.modify { - it + "\n" + - """ - kotlin.stdlib.default.dependency=false - """.trimIndent() - } - - buildAndFail("assemble") { - assertTasksFailed(":compileKotlinJs") - } - - buildGradleKts.modify { - it + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-js") - } - """.trimIndent().also { added = it } - } - - buildAndFail("assemble") { - assertTasksFailed(":compileKotlinJs") - } - - buildGradleKts.modify { - val replaced = it.replace(added!!, "") - replaced + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-dom-api-compat") - } - """.trimIndent().also { added = it } - } - - build("assemble") { - assertTasksExecuted(":compileKotlinJs") - } - - buildGradleKts.modify { - val replaced = it.replace(added!!, "") - replaced + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-js") - implementation("org.jetbrains.kotlin:kotlin-dom-api-compat") - } - """.trimIndent().also { added = it } - } - - build("assemble") { - assertTasksUpToDate(":compileKotlinJs") - } - } - } - - @DisplayName("Kotlin/JS DOM API automatically not added as dependency with disabled adding of DOM API") - @GradleTest - fun testJsDomApiCompatWithDisabledAddingDomApi(gradleVersion: GradleVersion) { - project("kotlin-js-dom-api-compat", gradleVersion) { - var added: String? = null - - gradleProperties.modify { - it + "\n" + - """ - kotlin.js.stdlib.dom.api.included=false - """.trimIndent() - } - - buildAndFail("assemble") { - assertTasksFailed(":compileKotlinJs") - } - - buildGradleKts.modify { - it + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-js") - } - """.trimIndent().also { added = it } - } - - buildAndFail("assemble") { - assertTasksFailed(":compileKotlinJs") - } - - buildGradleKts.modify { - val replaced = it.replace(added!!, "") - replaced + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-dom-api-compat") - } - """.trimIndent().also { added = it } - } - - build("assemble") { - assertTasksExecuted(":compileKotlinJs") - } - - buildGradleKts.modify { - val replaced = it.replace(added!!, "") - replaced + "\n" + - """ - dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib-js") - implementation("org.jetbrains.kotlin:kotlin-dom-api-compat") - } - """.trimIndent().also { added = it } - } - - build("assemble") { - assertTasksUpToDate(":compileKotlinJs") - } - } - } -} \ No newline at end of file