From fa2b21e71b56b1bbab5246a68d0b11ac110675b0 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Wed, 9 Aug 2023 11:39:01 +0200
Subject: [PATCH] [Gradle] Update IdeOriginalMetadataDependencyResolverTest:
 Test with kotlin-test-common instead of stdlib

(because stdlib is now published with new metadata formats)

See: KT-56278
^KT-60901 Verification Pending
---
 ...eOriginalMetadataDependencyResolverTest.kt | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

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..f1f1e26ed6b 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
@@ -8,6 +8,8 @@
 package org.jetbrains.kotlin.gradle.dependencyResolutionTests.tcs
 
 import org.jetbrains.kotlin.gradle.dependencyResolutionTests.mavenCentralCacheRedirector
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformSourceSetConventionsImpl.commonTest
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformSourceSetConventionsImpl.dependencies
 import org.jetbrains.kotlin.gradle.dsl.multiplatformExtension
 import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.assertMatches
 import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates
@@ -21,10 +23,10 @@ import org.junit.Test
 class IdeOriginalMetadataDependencyResolverTest {
 
     @Test
-    fun `test kotlin-stdlib-common`() {
+    fun `test kotlin-test-common`() {
         val project = buildProject {
             enableDependencyVerification(false)
-            enableDefaultStdlibDependency(true)
+            enableDefaultStdlibDependency(false)
             applyMultiplatformPlugin()
             repositories.mavenLocal()
             repositories.mavenCentralCacheRedirector()
@@ -36,17 +38,15 @@ class IdeOriginalMetadataDependencyResolverTest {
         kotlin.linuxX64()
         kotlin.linuxArm64()
 
-        kotlin.applyDefaultHierarchyTemplate()
+        kotlin.sourceSets.commonTest.dependencies {
+            implementation("org.jetbrains.kotlin:kotlin-test-common:${kotlin.coreLibrariesVersion}")
+        }
 
         project.evaluate()
 
-        val stdlibCommonSourceSets = listOf("commonMain", "commonTest").map(kotlin.sourceSets::getByName)
-
-        for (sourceSet in stdlibCommonSourceSets) {
-            IdeOriginalMetadataDependencyResolver.resolve(sourceSet).assertMatches(
-                binaryCoordinates("org.jetbrains.kotlin:kotlin-stdlib:common:${kotlin.coreLibrariesVersion}")
-            )
-        }
+        IdeOriginalMetadataDependencyResolver.resolve(kotlin.sourceSets.commonTest.get()).assertMatches(
+            binaryCoordinates("org.jetbrains.kotlin:kotlin-test-common:${kotlin.coreLibrariesVersion}")
+        )
     }
 
     @Test