From 243707c9561d9c626e1d48cf35ceb359747af2ea Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 9 Aug 2023 09:59:59 +0200 Subject: [PATCH] Revert "[stdlib-mpp] Disable/ignore failing tests in Kotlin Dev" This reverts commit 171d156688cea406ec55148f0e179d85b0901e18. KT-60901 --- .../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 deletions(-) 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 588f6705b5b..45dd0697bd5 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,7 +17,6 @@ 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 @@ -37,7 +36,6 @@ 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) @@ -200,7 +198,6 @@ 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) @@ -222,7 +219,6 @@ 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) @@ -1028,7 +1024,6 @@ 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 9f3253bce9a..f9986b4c00f 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,7 +7,6 @@ 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 @@ -194,7 +193,6 @@ 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 dae4584ecb0..5d81f25fac5 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,7 +13,6 @@ 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 @@ -28,7 +27,6 @@ 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) @@ -316,7 +314,6 @@ 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 a91971b61a9..e1426ca66fe 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,7 +11,6 @@ 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 @@ -52,7 +51,6 @@ 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 d7b4c9409bf..4f3593a8a07 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,7 +7,6 @@ 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 @@ -23,7 +22,6 @@ 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 -> @@ -33,7 +31,6 @@ 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"], @@ -68,7 +65,6 @@ 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 c8d6018f20b..9ed55e3c205 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,7 +122,6 @@ 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, @@ -157,7 +156,6 @@ 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, @@ -194,7 +192,6 @@ 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( @@ -230,7 +227,6 @@ 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 2835629c508..733846ea185 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,7 +19,6 @@ 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 @@ -39,7 +38,6 @@ 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 f70d5043963..be29ef0aec1 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,7 +20,6 @@ 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 @@ -161,7 +160,6 @@ 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 2d31b1d243e..00b0e064f8e 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,13 +16,11 @@ 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 020c5e02669..db93782a81c 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,7 +23,6 @@ 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 { @@ -149,7 +148,6 @@ 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 3ae7425eb63..462c9f2304e 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,7 +17,6 @@ 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 { @@ -72,7 +71,6 @@ 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 afc062b3554..9847324cf00 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,13 +17,11 @@ 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) })