From 6f5ffeb6bb2de2c173781fb324295bff30b6e319 Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Wed, 11 Jan 2023 12:17:06 +0100
Subject: [PATCH] [Gradle][MPP] Fix test after K/N targets deprecation

---
 .../gradle/unitTests/CInteropCommonizerTaskTest.kt | 14 +++-----------
 .../unitTests/KotlinTargetHierarchyDslTest.kt      |  1 +
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt
index cc2294abfa5..012e2c7cc51 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/CInteropCommonizerTaskTest.kt
@@ -278,12 +278,11 @@ class CInteropCommonizerTaskTest : MultiplatformExtensionTest() {
         val iosX64 = kotlin.iosX64()
         val iosArm64 = kotlin.iosArm64()
         val windows64 = kotlin.mingwX64("windows64")
-        val windows32 = kotlin.mingwX86("windows32")
         kotlin.jvm()
         kotlin.js().browser()
 
-        val nativeTargets = listOf(linux, macos, iosX64, iosArm64, windows64, windows32)
-        val windowsTargets = listOf(windows64, windows32)
+        val nativeTargets = listOf(linux, macos, iosX64, iosArm64, windows64)
+        val windowsTargets = listOf(windows64)
         val unixLikeTargets = listOf(linux, macos, iosX64, iosArm64)
         val appleTargets = listOf(macos, iosX64, iosArm64)
         val iosTargets = listOf(iosX64, iosArm64)
@@ -373,7 +372,6 @@ class CInteropCommonizerTaskTest : MultiplatformExtensionTest() {
 
         assertCInteropDependentEqualsForSourceSetAndCompilation(nativeMain)
         assertCInteropDependentEqualsForSourceSetAndCompilation(unixMain)
-        assertCInteropDependentEqualsForSourceSetAndCompilation(windowsMain)
         assertCInteropDependentEqualsForSourceSetAndCompilation(appleMain)
         assertCInteropDependentEqualsForSourceSetAndCompilation(iosMain)
 
@@ -382,13 +380,12 @@ class CInteropCommonizerTaskTest : MultiplatformExtensionTest() {
 
         val nativeCommonizerTarget = SharedCommonizerTarget(nativeTargets.map { it.konanTarget })
         val unixLikeCommonizerTarget = SharedCommonizerTarget(unixLikeTargets.map { it.konanTarget })
-        val windowsCommonizerTarget = SharedCommonizerTarget(windowsTargets.map { it.konanTarget })
         val appleCommonizerTarget = SharedCommonizerTarget(appleTargets.map { it.konanTarget })
         val iosCommonizerTarget = SharedCommonizerTarget(iosTargets.map { it.konanTarget })
 
         val expectedMainGroup = CInteropCommonizerGroup(
             targets = setOf(
-                nativeCommonizerTarget, unixLikeCommonizerTarget, windowsCommonizerTarget,
+                nativeCommonizerTarget, unixLikeCommonizerTarget,
                 appleCommonizerTarget, iosCommonizerTarget
             ),
             interops = nativeTargets.map { target -> target.mainCinteropIdentifier("nativeHelper") }.toSet() +
@@ -429,11 +426,6 @@ class CInteropCommonizerTaskTest : MultiplatformExtensionTest() {
             "Expected unixMain being part of the mainGroup"
         )
 
-        assertEquals(
-            mainGroup, task.findInteropsGroup(expectCInteropCommonizerDependent(windowsMain)),
-            "Expected windowsMain being part of the mainGroup"
-        )
-
         assertEquals(
             mainGroup, task.findInteropsGroup(expectCInteropCommonizerDependent(appleMain)),
             "Expected appleMain being part of the mainGroup"
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt
index ccb6dc8884b..e22605b65c6 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt
@@ -24,6 +24,7 @@ class KotlinTargetHierarchyDslTest {
 
 
     @Test
+    @Suppress("DEPRECATION") // deprecated K/N targets
     fun `test - hierarchy default - targets from all families`() {
         kotlin.apply {
             targetHierarchy.default()