From afa9c2f8b9d890d7528ddadb5ca4880ce7194d4b Mon Sep 17 00:00:00 2001
From: Dmitry Savvinov <dmitry.savvinov@jetbrains.com>
Date: Wed, 10 Aug 2022 14:50:14 +0200
Subject: [PATCH] [mpp, tests] Use JUnit5 in kotlin-project-model tests

---
 .../tools/kotlin-project-model/build.gradle.kts      |  6 +++++-
 .../model/DefaultModuleFragmentsResolverTest.kt      | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-project-model/build.gradle.kts b/libraries/tools/kotlin-project-model/build.gradle.kts
index 08e59a976e8..a0ca56f214c 100644
--- a/libraries/tools/kotlin-project-model/build.gradle.kts
+++ b/libraries/tools/kotlin-project-model/build.gradle.kts
@@ -13,13 +13,17 @@ standardPublicJars()
 dependencies {
     implementation(kotlinStdlib())
     implementation(project(":kotlin-tooling-core"))
-    testFixturesImplementation(kotlin("test-junit"))
+    testApiJUnit5(runner = true)
     testFixturesImplementation(project(":kotlin-tooling-core"))
     testFixturesImplementation(project(":core:util.runtime"))
     testFixturesImplementation(projectTests(":generators:test-generator"))
     testFixturesImplementation(project(":kotlin-reflect"))
 }
 
+projectTest(jUnitMode = JUnitMode.JUnit5) {
+    useJUnitPlatform()
+}
+
 tasks.withType<KotlinJvmCompile>().configureEach {
     kotlinOptions {
         languageVersion = "1.4"
diff --git a/libraries/tools/kotlin-project-model/src/test/kotlin/org/jetbrains/kotlin/project/model/DefaultModuleFragmentsResolverTest.kt b/libraries/tools/kotlin-project-model/src/test/kotlin/org/jetbrains/kotlin/project/model/DefaultModuleFragmentsResolverTest.kt
index 5d56a39a05a..c8c11e2e480 100644
--- a/libraries/tools/kotlin-project-model/src/test/kotlin/org/jetbrains/kotlin/project/model/DefaultModuleFragmentsResolverTest.kt
+++ b/libraries/tools/kotlin-project-model/src/test/kotlin/org/jetbrains/kotlin/project/model/DefaultModuleFragmentsResolverTest.kt
@@ -5,10 +5,10 @@
 
 package org.jetbrains.kotlin.project.model
 
-import org.junit.Assume.assumeTrue
-import org.junit.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Assumptions.assumeTrue
+import org.junit.jupiter.api.Test
 
 internal class DefaultModuleFragmentsResolverTest {
     val bundleFoo = simpleModuleBundle("foo")
@@ -34,7 +34,7 @@ internal class DefaultModuleFragmentsResolverTest {
             val result = fragmentResolver.getChosenFragments(consumingFragment, moduleFooMain)
             assertTrue(result is KpmFragmentResolution.ChosenFragments)
             val expected = expectedVisibleFragments.getValue(consumingFragment.fragmentName)
-            assertEquals(expected, result.visibleFragments.map { it.fragmentName }.toSet())
+            assertEquals(expected, (result as KpmFragmentResolution.ChosenFragments).visibleFragments.map { it.fragmentName }.toSet())
         }
     }
 
@@ -53,7 +53,7 @@ internal class DefaultModuleFragmentsResolverTest {
         val (commonMainResult, jsAndLinuxResult) = listOf("common", "jsAndLinux").map {
             val chosenFragments = fragmentResolver.getChosenFragments(dependingModule.fragment(it), moduleFooMain)
             assertTrue(chosenFragments is KpmFragmentResolution.ChosenFragments)
-            chosenFragments.visibleFragments.map { it.fragmentName }.toSet()
+            (chosenFragments as KpmFragmentResolution.ChosenFragments).visibleFragments.map { it.fragmentName }.toSet()
         }
 
         assertEquals(setOf("common", "jvmAndJs"), commonMainResult)