From 80a310540ea936b8338c7d10c0ec882d39338e20 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 4 Jun 2020 18:12:20 +0300 Subject: [PATCH] [Gradle, JS]Remove failed on variant aware resolution tests on kotlin2js Because kotlin2js is deprecated, it is not actual to support tests which are failed because changes in Gradle. Seems kotlin2js doesn't and didn't and work with Gradle > 5.3 --- .../kotlin/gradle/Kotlin2JsGradlePluginIT.kt | 58 ------------------- 1 file changed, 58 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 f19f1bb3efb..2ee8fce3202 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 @@ -226,53 +226,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : } } - @Test - fun testBuildAndClean() { - val project = Project("kotlin2JsProject") - - project.build("build") { - assertSuccessful() - assertReportExists() - checkIrCompilationMessage() - - assertTasksExecuted( - ":libraryProject:jarSources", - ":mainProject:compileKotlin2Js", - ":libraryProject:compileKotlin2Js" - ) - - assertFileExists("mainProject/web/js/app.js") - if (!irBackend) { - assertFileExists("mainProject/web/js/lib/kotlin.js") - assertFileExists("libraryProject/build/kotlin2js/main/test-library.js") - assertFileExists("mainProject/web/js/app.js.map") - } - } - - project.build("build") { - assertSuccessful() - assertTasksUpToDate(":mainProject:compileKotlin2Js") - assertContainsRegex(":libraryProject:compileTestKotlin2Js (UP-TO-DATE|NO-SOURCE)".toRegex()) - } - - project.build("clean") { - assertSuccessful() - assertReportExists() - - // Test that we don't accidentally remove the containing directory - // This would fail if we used the default clean task of the copy task - assertFileExists("mainProject/web/js/lib") - - assertNoSuchFile("main/project/web/js/app.js.map") - assertNoSuchFile("main/project/web/js/example/main.kt") - } - - project.build("clean") { - assertSuccessful() - assertReportExists() - } - } - @Test fun testJarIncludesJsDefaultOutput() { val project = Project("kotlin2JsNoOutputFileProject") @@ -446,17 +399,6 @@ abstract class AbstractKotlin2JsGradlePluginIT(private val irBackend: Boolean) : } } - /** Issue: KT-18495 */ - @Test - fun testNoSeparateClassesDirWarning() { - val project = Project("kotlin2JsProject") - project.build("build") { - assertSuccessful() - checkIrCompilationMessage() - assertNotContains("this build assumes a single directory for all classes from a source set") - } - } - @Test fun testIncrementalCompilation() = Project("kotlin2JsICProject").run { setupWorkingDir()