From 171d156688cea406ec55148f0e179d85b0901e18 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 2 Aug 2023 15:51:43 +0200 Subject: [PATCH] [stdlib-mpp] Disable/ignore failing tests in Kotlin Dev KT-60901, KT-59000, KT-56106 --- .../kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt | 5 +++++ .../jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt | 2 ++ .../org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt | 3 +++ .../jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt | 2 ++ .../kotlin/gradle/native/NativeExternalDependenciesIT.kt | 4 ++++ .../jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt | 4 ++++ .../LazyResolvedConfigurationTest.kt | 2 ++ .../tcs/IdeJvmAndAndroidDependencyResolutionTest.kt | 2 ++ .../tcs/IdeOriginalMetadataDependencyResolverTest.kt | 2 ++ .../dependencyResolutionTests/tcs/IdeStdlibResolutionTest.kt | 2 ++ .../tcs/IdeTransformedMetadataDependencyResolverTest.kt | 2 ++ .../tcs/WasmDependencyResolutionSmokeTest.kt | 2 ++ 12 files changed, 32 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt index 45dd0697bd5..588f6705b5b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/HierarchicalMppIT.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.util.checkedReplace import org.jetbrains.kotlin.gradle.util.modify +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.OS import org.junit.jupiter.api.io.TempDir @@ -36,6 +37,7 @@ open class HierarchicalMppIT : KGPBaseTest() { private val String.withPrefix get() = "hierarchical-mpp-published-modules/$this" @GradleTest + @Disabled("stdlib publication migration - test data changes") @DisplayName("Check build with published third-party library") fun testPublishedModules(gradleVersion: GradleVersion, @TempDir tempDir: Path) { val buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG) @@ -198,6 +200,7 @@ open class HierarchicalMppIT : KGPBaseTest() { } @GradleTest + @Disabled("stdlib publication migration - test data changes") @DisplayName("Dependencies in project should be correct with third-party library") fun testProjectDependencies(gradleVersion: GradleVersion, @TempDir tempDir: Path) { publishThirdPartyLib(withGranularMetadata = false, gradleVersion = gradleVersion, localRepoDir = tempDir) @@ -219,6 +222,7 @@ open class HierarchicalMppIT : KGPBaseTest() { } @GradleTest + @Disabled("stdlib publication migration - test data changes") @DisplayName("Check that only composite metadata artifacts are transformed") fun testOnlyCompositeMetadataArtifactsTransformed(gradleVersion: GradleVersion, @TempDir tempDir: Path) { val buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG) @@ -1024,6 +1028,7 @@ open class HierarchicalMppIT : KGPBaseTest() { } @GradleTest + @Disabled("stdlib publication migration") @DisplayName("KT-46417: [UNRESOLVED_REFERENCE] For project to project dependencies of native platform test source sets") fun testNativeLeafTestSourceSetsKt46417(gradleVersion: GradleVersion) { with(project("kt-46417-ios-test-source-sets", gradleVersion = gradleVersion)) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt index f9986b4c00f..9f3253bce9a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/VariantAwareDependenciesMppIT.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.util.* +import org.junit.Ignore import org.junit.Test import kotlin.test.assertTrue @@ -193,6 +194,7 @@ class VariantAwareDependenciesMppIT : BaseGradleIT() { } @Test + @Ignore("stdlib publication migration") fun testResolvesOldKotlinArtifactsPublishedWithMetadata() = with(Project("multiplatformProject", gradleVersion)) { setupWorkingDir() gradleBuildScript().appendText( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt index 5d81f25fac5..dae4584ecb0 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.gradle.idea.tcs.IdeaKotlinSourceDependency.Type.Regu import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.* import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.util.* +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.OS import kotlin.test.assertEquals @@ -27,6 +28,7 @@ import kotlin.test.assertIs @GradleTestVersions(maxVersion = TestVersions.Gradle.G_8_2) class MppCompositeBuildIT : KGPBaseTest() { @GradleTest + @Disabled("stdlib publication migration - test data changes") fun `test - sample0 - ide dependencies`(gradleVersion: GradleVersion) { val producer = project("mpp-composite-build/sample0/producerBuild", gradleVersion) @@ -314,6 +316,7 @@ class MppCompositeBuildIT : KGPBaseTest() { } @GradleTest + @Disabled("stdlib publication migration - test data changes") fun `test - sample5-KT-56536-rootProject_name - ide dependencies`(gradleVersion: GradleVersion) { val producer = project("mpp-composite-build/sample5-KT-56536-rootProject.name/producerBuild", gradleVersion) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt index e1426ca66fe..a91971b61a9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppSharedNativeCompileIT.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.konan.properties.hasProperty import org.jetbrains.kotlin.library.KLIB_PROPERTY_DEPENDS import org.jetbrains.kotlin.library.ToolingSingleFileKlibResolveStrategy import org.jetbrains.kotlin.library.unresolvedDependencies +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.fail @@ -51,6 +52,7 @@ class MppSharedNativeCompileIT : KGPBaseTest() { * */ @GradleTest + @Disabled("stdlib publication migration") fun `test - K2 - shared native compilation - assemble`(gradleVersion: GradleVersion) { project("kt-57944-k2-native-compilation", gradleVersion, buildOptions = defaultBuildOptions.copy(languageVersion = "2.0")) { build("assemble") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeExternalDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeExternalDependenciesIT.kt index 4f3593a8a07..d7b4c9409bf 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeExternalDependenciesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeExternalDependenciesIT.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.native import org.gradle.util.GradleVersion import org.jetbrains.kotlin.gradle.testbase.* +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.DisabledOnOs import org.junit.jupiter.api.condition.OS @@ -22,6 +23,7 @@ import kotlin.test.assertNull internal class NativeExternalDependenciesIT : KGPBaseTest() { @DisplayName("K/N shouldn't contain any external dependencies by default") + @Disabled("stdlib publication migration - test data changes") @GradleTest fun shouldNotUseExternalDependencies(gradleVersion: GradleVersion) { buildProjectWithDependencies(gradleVersion) { externalDependenciesText -> @@ -31,6 +33,7 @@ internal class NativeExternalDependenciesIT : KGPBaseTest() { @DisplayName("Should build with ktor 1.5.4 and coroutines 1.5.0-RC-native-mt") @GradleTest + @Disabled("stdlib publication migration - test data changes") @DisabledOnOs( value = [OS.MAC], architectures = ["aarch64"], @@ -65,6 +68,7 @@ internal class NativeExternalDependenciesIT : KGPBaseTest() { } @DisplayName("Should build with ktor 1.6.5 and coroutines 1.5.2-native-mt") + @Disabled("stdlib publication migration - test data changes") @GradleTest fun shouldUseKtorAndCoroutinesExternalDependencies(gradleVersion: GradleVersion) { buildProjectWithDependencies( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt index 9ed55e3c205..c8d6018f20b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativeIrLinkerIssuesIT.kt @@ -122,6 +122,7 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { @DisplayName("KT-41378: declaration that is gone - with cache") @GradleTest + @Disabled("stdlib publication migration - test data changes") @DisabledOnOs(OS.WINDOWS, disabledReason = "Don't run it on Windows. Caches are not supported there yet.") fun shouldBuildIrLinkerWithCache( gradleVersion: GradleVersion, @@ -156,6 +157,7 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { } @DisplayName("KT-41378: declaration that is gone - without cache") + @Disabled("stdlib publication migration - test data changes") @GradleTest fun shouldBuildIrLinkerWithoutCache( gradleVersion: GradleVersion, @@ -192,6 +194,7 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { @DisplayName("KT-47285: symbol type mismatch - with cache") @GradleTest + @Disabled("stdlib publication migration - test data changes") @OsCondition(supportedOn = [OS.MAC, OS.LINUX], enabledOnCI = [OS.LINUX]) // Don't run it on Windows. Caches are not supported there yet. fun shouldBuildIrLinkerSymbolTypeMismatchWithCache( @@ -227,6 +230,7 @@ internal class NativeIrLinkerIssuesIT : KGPBaseTest() { } @DisplayName("KT-47285: symbol type mismatch - without cache") + @Disabled("stdlib publication migration - test data changes") @GradleTest fun shouldBuildIrLinkerSymbolTypeMismatchWithoutCache( gradleVersion: GradleVersion, diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/LazyResolvedConfigurationTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/LazyResolvedConfigurationTest.kt index 733846ea185..2835629c508 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/LazyResolvedConfigurationTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/LazyResolvedConfigurationTest.kt @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin import org.jetbrains.kotlin.gradle.util.buildProject import org.jetbrains.kotlin.gradle.util.enableDependencyVerification import org.jetbrains.kotlin.gradle.utils.LazyResolvedConfiguration +import org.junit.Ignore import org.junit.Test import kotlin.test.assertEquals import kotlin.test.fail @@ -38,6 +39,7 @@ class LazyResolvedConfigurationTest { } @Test + @Ignore("stdlib publication migration - test data changes") fun `test - okio - getArtifacts`() { val project = buildProject { enableDependencyVerification(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt index be29ef0aec1..f70d5043963 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeJvmAndAndro import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.gradle.utils.androidExtension +import org.junit.Ignore import kotlin.test.BeforeTest import kotlin.test.Test @@ -160,6 +161,7 @@ class IdeJvmAndAndroidDependencyResolutionTest { } @Test + @Ignore("stdlib publication migration - test data changes") fun `test - MVIKotlin - binary dependencies - with stdlib enabled by default`() { val project = buildProject { configureAndroidAndMultiplatform(enableDefaultStdlib = true) } val kotlin = project.multiplatformExtension diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeOriginalMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeOriginalMetadataDependencyResolverTest.kt index 00b0e064f8e..2d31b1d243e 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeOriginalMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeOriginalMetadataDependencyResolverTest.kt @@ -16,11 +16,13 @@ import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin import org.jetbrains.kotlin.gradle.util.buildProject import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency import org.jetbrains.kotlin.gradle.util.enableDependencyVerification +import org.junit.Ignore import org.junit.Test class IdeOriginalMetadataDependencyResolverTest { @Test + @Ignore("stdlib publication migration - test data changes") fun `test kotlin-stdlib-common`() { val project = buildProject { enableDependencyVerification(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeStdlibResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeStdlibResolutionTest.kt index db93782a81c..020c5e02669 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeStdlibResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeStdlibResolutionTest.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.gradle.util.buildProject import org.jetbrains.kotlin.gradle.util.enableDefaultStdlibDependency import org.jetbrains.kotlin.gradle.util.enableDependencyVerification import org.jetbrains.kotlin.gradle.utils.androidExtension +import org.junit.Ignore import org.junit.Test class IdeStdlibResolutionTest { @@ -148,6 +149,7 @@ class IdeStdlibResolutionTest { } @Test + @Ignore("stdlib publication migration") fun `test nativeShared`() { val project = createProjectWithDefaultStdlibEnabled() diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt index 462c9f2304e..3ae7425eb63 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeTransformedMetadataDependencyResolverTest.kt @@ -17,6 +17,7 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeTransformedMetadataDependencyResolver import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import org.jetbrains.kotlin.gradle.util.* +import org.junit.Ignore import org.junit.Test class IdeTransformedMetadataDependencyResolverTest { @@ -71,6 +72,7 @@ class IdeTransformedMetadataDependencyResolverTest { } @Test + @Ignore("stdlib publication migration - test data changes") fun `test OKIO in JVM + Android project`() { val project = buildProject { enableDependencyVerification(false) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/WasmDependencyResolutionSmokeTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/WasmDependencyResolutionSmokeTest.kt index 9847324cf00..afc062b3554 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/WasmDependencyResolutionSmokeTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/WasmDependencyResolutionSmokeTest.kt @@ -17,11 +17,13 @@ import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl import org.jetbrains.kotlin.gradle.util.applyMultiplatformPlugin import org.jetbrains.kotlin.gradle.util.buildProject import org.jetbrains.kotlin.gradle.util.enableDependencyVerification +import kotlin.test.Ignore import kotlin.test.Test class WasmDependencyResolutionSmokeTest { @Test + @Ignore("stdlib publication migration") fun `test - project to project ide dependency resolution`() { val rootProject = buildProject() val consumer = buildProject(projectBuilder = { withName("consumer").withParent(rootProject) })