[MPP][Tests][stdlib] Remove ignore annotations from MPP tests
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 588f670..d60d10a 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.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 @@ 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 @@ } @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 @@ } @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) @@ -280,11 +276,10 @@ testDependencyTransformations { assertEquals( setOf( - "my-lib-foo-metadata-1.0-all.jar", "my-lib-bar-metadata-1.0-all.jar", - "third-party-lib-metadata-1.0.jar", + "my-lib-foo-metadata-1.0-all.jar", "kotlin-stdlib-${buildOptions.kotlinVersion}-all.jar", - "kotlin-test-js-${buildOptions.kotlinVersion}.jar", + "third-party-lib-metadata-1.0.jar", "kotlin-dom-api-compat-${buildOptions.kotlinVersion}.klib" ), transformedArtifacts() @@ -437,9 +432,9 @@ val expectedProjectStructureMetadata = expectedProjectStructureMetadata( sourceSetModuleDependencies = mapOf( - "jvmAndJsMain" to setOf("com.example.thirdparty" to "third-party-lib"), - "linuxAndJsMain" to emptySet(), - "commonMain" to emptySet() + "commonMain" to emptySet(), + "jvmAndJsMain" to setOf("com.example.thirdparty" to "third-party-lib", "org.jetbrains.kotlin" to "kotlin-stdlib"), + "linuxAndJsMain" to setOf("org.jetbrains.kotlin" to "kotlin-stdlib"), ) ) @@ -487,9 +482,9 @@ val expectedProjectStructureMetadata = expectedProjectStructureMetadata( sourceSetModuleDependencies = mapOf( - "jvmAndJsMain" to setOf(), - "linuxAndJsMain" to emptySet(), - "commonMain" to setOf("com.example.foo" to "my-lib-foo") + "commonMain" to setOf("com.example.foo" to "my-lib-foo"), + "jvmAndJsMain" to setOf("org.jetbrains.kotlin" to "kotlin-stdlib"), + "linuxAndJsMain" to setOf("org.jetbrains.kotlin" to "kotlin-stdlib"), ) ) @@ -641,20 +636,20 @@ sourceSetModuleDependencies: Map<String, Set<Pair<String, String>>> ): KotlinProjectStructureMetadata { - val jvmSourceSets = setOf("commonMain", "jvmAndJsMain") - val jsSourceSets = setOf("commonMain", "jvmAndJsMain", "linuxAndJsMain") + val jvmSourceSets = setOf("jvmAndJsMain", "commonMain") + val jsSourceSets = setOf("jvmAndJsMain", "commonMain", "linuxAndJsMain") return KotlinProjectStructureMetadata( sourceSetNamesByVariantName = mapOf( "jsApiElements" to jsSourceSets, "jsRuntimeElements" to jsSourceSets, "jvmApiElements" to jvmSourceSets, "jvmRuntimeElements" to jvmSourceSets, - "linuxX64ApiElements" to setOf("commonMain", "linuxAndJsMain") + "linuxX64ApiElements" to setOf("linuxAndJsMain", "commonMain",) ), sourceSetsDependsOnRelation = mapOf( + "commonMain" to emptySet(), "jvmAndJsMain" to setOf("commonMain"), "linuxAndJsMain" to setOf("commonMain"), - "commonMain" to emptySet() ), sourceSetModuleDependencies = sourceSetModuleDependencies.mapValues { (_, pairs) -> pairs.map { @@ -664,7 +659,7 @@ sourceSetCInteropMetadataDirectory = mapOf(), hostSpecificSourceSets = emptySet(), sourceSetBinaryLayout = sourceSetModuleDependencies.mapValues { SourceSetMetadataLayout.KLIB }, - sourceSetNames = setOf("commonMain", "jvmAndJsMain", "linuxAndJsMain"), + sourceSetNames = setOf("jvmAndJsMain", "commonMain", "linuxAndJsMain"), isPublishedAsRoot = true ) } @@ -1028,12 +1023,14 @@ } @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)) { testDependencyTransformations("p2") { reports -> - val report = reports.singleOrNull { it.sourceSetName == "iosArm64Test" && it.scope == "implementation" } + val report = reports.singleOrNull { + it.sourceSetName == "iosArm64Test" && it.scope == "implementation" + && it.groupAndModule == "kt-46417-ios-test-source-sets:p1" + } assertNotNull(report, "No single report for 'iosArm64' and implementation scope") assertEquals(setOf("commonMain", "iosMain"), report.allVisibleSourceSets) assertTrue(report.groupAndModule.endsWith(":p1"))
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 9f3253b..f9986b4 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 @@ 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 @@ } @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 dae4584..3520607 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.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 @@ @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) @@ -37,7 +35,8 @@ resolveIdeDependencies(":consumerA") { dependencies -> dependencies["commonMain"].assertMatches( regularSourceDependency(":producerBuild::producerA/commonMain"), - kotlinStdlibDependencies + kotlinStdlibDependencies, + binaryCoordinates(Regex(".*kotlin-stdlib:commonMain.*")) // kotlin-stdlib-common is no longer part of stdlib ) dependencies["nativeMain"].assertMatches( @@ -46,7 +45,6 @@ regularSourceDependency(":producerBuild::producerA/nativeMain"), regularSourceDependency(":producerBuild::producerA/linuxMain"), kotlinNativeDistributionDependencies, - binaryCoordinates(Regex(".*stdlib-common:.*")) /* KT-56278 */ ) dependencies["linuxMain"].assertMatches( @@ -316,7 +314,6 @@ } @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) @@ -325,7 +322,8 @@ resolveIdeDependencies(":consumerA") { dependencies -> dependencies["commonMain"].assertMatches( regularSourceDependency(":producerBuild::producerA/commonMain"), - kotlinStdlibDependencies + kotlinStdlibDependencies, + binaryCoordinates(Regex(".*kotlin-stdlib:commonMain.*")) // kotlin-stdlib-common is no longer part of stdlib ) dependencies["nativeMain"].assertMatches( @@ -334,7 +332,6 @@ regularSourceDependency(":producerBuild::producerA/nativeMain"), regularSourceDependency(":producerBuild::producerA/linuxMain"), kotlinNativeDistributionDependencies, - binaryCoordinates(Regex(".*stdlib-common:.*")) /* KT-56278 */ ) dependencies["linuxMain"].assertMatches(
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 a91971b..e1426ca 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.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 @@ * */ @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/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 2835629..733846e 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.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 @@ } @Test - @Ignore("stdlib publication migration - test data changes") fun `test - okio - getArtifacts`() { val project = buildProject { enableDependencyVerification(false)