From da2e6d93ff0922913c7a2301279b27bccd4c5874 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Tue, 8 Aug 2023 14:17:08 +0200
Subject: [PATCH] [Native][tests] Don't use trove4j in K/N new test infra

---
 native/native.tests/build.gradle.kts                           | 1 -
 .../konan/blackboxtest/support/settings/SettingsContainers.kt  | 3 +--
 .../tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt     | 3 +--
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts
index 60850074cd5..74a2f287d1b 100644
--- a/native/native.tests/build.gradle.kts
+++ b/native/native.tests/build.gradle.kts
@@ -24,7 +24,6 @@ dependencies {
     testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-metadata-klib"))
     testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
 
-    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
     testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil"))
 }
 
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt
index 4499496b3cc..e1a760ff133 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt
@@ -5,13 +5,12 @@
 
 package org.jetbrains.kotlin.konan.blackboxtest.support.settings
 
-import gnu.trove.THashMap
 import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue
 import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
 import kotlin.reflect.KClass
 
 internal abstract class Settings(private val parent: Settings?, settings: Iterable<Any>) {
-    private val map: Map<KClass<*>, Any> = THashMap<KClass<*>, Any>().apply {
+    private val map: Map<KClass<*>, Any> = buildMap {
         settings.forEach {
             val settingClass: KClass<*>
             val setting: Any
diff --git a/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt b/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
index a09cc8e153e..3bd1307496d 100644
--- a/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+++ b/repo/codebase-tests/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
@@ -252,8 +252,7 @@ class CodeConformanceTest : TestCase() {
                     "native/commonizer/src/org/jetbrains/kotlin/commonizer/mergedtree/CirTypeSignature.kt",
                     "native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt",
                     "native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt",
-                    "native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt",
-                    "native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/settings/SettingsContainers.kt"
+                    "native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/misc.kt"
                 )
             ) { _, source ->
                 "gnu.trove" in source