From 1034e47a2a3454c4313c46f300865ec081c9fb3b Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 13 Jun 2022 14:35:28 +0200 Subject: [PATCH] [kpm] kgp: functionalTest: Use new kgp-idea testFixtures ^KT-52568 In Progress --- .../AbstractLightweightIdeaDependencyResolutionTest.kt | 6 +++--- .../kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt index 08649f1f863..d0d93cc1d93 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/AbstractLightweightIdeaDependencyResolutionTest.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.commonizer.KonanDistribution import org.jetbrains.kotlin.commonizer.platformLibsDir import org.jetbrains.kotlin.compilerRunner.konanHome import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency -import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.IdeaKpmBinaryDependencyMatcher +import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmBinaryDependencyMatcher import org.jetbrains.kotlin.gradle.plugin.mpp.enabledOnCurrentHost import org.jetbrains.kotlin.konan.target.KonanTarget @@ -42,8 +42,8 @@ abstract class AbstractLightweightIdeaDependencyResolutionTest { val Project.konanDistribution get() = KonanDistribution(project.konanHome) - fun Project.nativePlatformLibraries(target: KonanTarget): IdeaKpmBinaryDependencyMatcher? = - IdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.platformLibsDir.resolve(target.name)) + fun Project.nativePlatformLibraries(target: KonanTarget): TestIdeaKpmBinaryDependencyMatcher? = + TestIdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.platformLibsDir.resolve(target.name)) .takeIf { target.enabledOnCurrentHost } } diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt index d1cec3bab3f..6836eecf10b 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/StdlibKotlinIdeaDependencyResolutionTest.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.gradle.enableDefaultStdlibDependency import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin import org.jetbrains.kotlin.gradle.kpm.buildIdeaKpmProjectModel import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKpmDependency.Companion.CLASSPATH_BINARY_TYPE -import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.IdeaKpmBinaryDependencyMatcher +import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.TestIdeaKpmBinaryDependencyMatcher import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertContainsFragment import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertIsNotEmpty import org.jetbrains.kotlin.gradle.kpm.idea.testFixtures.assertResolvedBinaryDependencies @@ -58,7 +58,7 @@ class StdlibKotlinIdeaDependencyResolutionTest : AbstractLightweightIdeaDependen /* native fragments only references dependencies from the native distribution */ listOf("iosCommon", "iosX64", "iosArm64").forEach { fragmentName -> module.assertContainsFragment(fragmentName).assertResolvedBinaryDependencies( - CLASSPATH_BINARY_TYPE, IdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.root) + CLASSPATH_BINARY_TYPE, TestIdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.root) ) } } @@ -112,7 +112,7 @@ class StdlibKotlinIdeaDependencyResolutionTest : AbstractLightweightIdeaDependen listOf("iosCommon", "iosX64", "iosArm64").forEach { fragmentName -> module.assertContainsFragment(fragmentName).assertResolvedBinaryDependencies( CLASSPATH_BINARY_TYPE, - IdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.root), + TestIdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.root), /* Actually not correct as well, since those are jvm dependencies. Filtering is not easily possible here, as well */ "org.jetbrains.kotlin:kotlin-stdlib:1.6.10", @@ -155,7 +155,7 @@ class StdlibKotlinIdeaDependencyResolutionTest : AbstractLightweightIdeaDependen listOf("iosCommon", "iosX64", "iosArm64").forEach { fragmentName -> module.assertContainsFragment(fragmentName).assertResolvedBinaryDependencies( CLASSPATH_BINARY_TYPE, - IdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.root), + TestIdeaKpmBinaryDependencyMatcher.InDirectory(project.konanDistribution.root), ) } }