From c802fd30c02ec3b25285231d9383a11c32ed15e6 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Wed, 14 Dec 2022 12:55:42 +0100
Subject: [PATCH] [Gradle] IdeJvmAndAndroidDependencyResolutionTest: Add
 assertion on jvmAndAndroidTest

^KT-55475 Verification Pending
---
 .../IdeJvmAndAndroidDependencyResolutionTest.kt  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeJvmAndAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeJvmAndAndroidDependencyResolutionTest.kt
index 32bc962dca8..a7135ac2eef 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeJvmAndAndroidDependencyResolutionTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/ide/IdeJvmAndAndroidDependencyResolutionTest.kt
@@ -10,10 +10,7 @@ package org.jetbrains.kotlin.gradle.ide
 import org.gradle.api.Project
 import org.jetbrains.kotlin.gradle.*
 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
-import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.dependsOnDependency
-import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.regularSourceDependency
+import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.*
 import org.jetbrains.kotlin.gradle.kpm.idea.mavenCentralCacheRedirector
 import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.IdeJvmAndAndroidPlatformBinaryDependencyResolver
 import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport
@@ -31,6 +28,7 @@ class IdeJvmAndAndroidDependencyResolutionTest {
     private fun Project.configureAndroidAndMultiplatform() {
         enableDefaultStdlibDependency(false)
         enableDependencyVerification(false)
+        setMultiplatformAndroidSourceSetLayoutVersion(2)
         applyMultiplatformPlugin()
         plugins.apply("com.android.library")
         androidExtension.compileSdkVersion(33)
@@ -81,7 +79,7 @@ class IdeJvmAndAndroidDependencyResolutionTest {
 
     @Test
     fun `test - project to project dependency`() {
-        val root = buildProject()
+        val root = buildProject { setMultiplatformAndroidSourceSetLayoutVersion(2) }
         val producer = buildProject({ withParent(root).withName("producer") }) { configureAndroidAndMultiplatform() }
         val consumer = buildProject({ withParent(root).withName("consumer") }) { configureAndroidAndMultiplatform() }
 
@@ -98,5 +96,13 @@ class IdeJvmAndAndroidDependencyResolutionTest {
             regularSourceDependency(":producer/commonMain"),
             regularSourceDependency(":producer/jvmAndAndroidMain"),
         )
+
+        consumer.kotlinIdeMultiplatformImport.resolveDependencies("jvmAndAndroidTest").assertMatches(
+            dependsOnDependency(":consumer/commonTest"),
+            friendSourceDependency(":consumer/commonMain"),
+            friendSourceDependency(":consumer/jvmAndAndroidMain"),
+            regularSourceDependency(":producer/commonMain"),
+            regularSourceDependency(":producer/jvmAndAndroidMain"),
+        )
     }
 }