From 6e3a46cf364addef3ab2a5d06703b55bca73b613 Mon Sep 17 00:00:00 2001
From: Bart van Helvert <bart.vanhelvert@jetbrains.com>
Date: Sat, 14 Sep 2024 13:09:37 +0200
Subject: [PATCH] [jvm] Fix test method without assertions inspection for
 Kotlin assertions

#KTIJ-31326 Fixed

GitOrigin-RevId: bb2cd382795252b986a505405d13419e9269857a
---
 .../TestMethodWithoutAssertionInspection.kt   |  3 ++-
 ...estMethodWithoutAssertionInspectionTest.kt |  4 ----
 ...estMethodWithoutAssertionInspectionTest.kt | 21 ++-----------------
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/TestMethodWithoutAssertionInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/TestMethodWithoutAssertionInspection.kt
index 2fb4144d1e6b..72bfbeb6ceaa 100644
--- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/TestMethodWithoutAssertionInspection.kt
+++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/test/TestMethodWithoutAssertionInspection.kt
@@ -46,7 +46,8 @@ class TestMethodWithoutAssertionInspection : AbstractBaseUastLocalInspectionTool
     .add("org.hamcrest.MatcherAssert", "assertThat")
     .add("mockit.Verifications", "Verifications")
     .add("kotlin.PreconditionsKt__AssertionsJVMKt", "assert")
-    .add("kotlin.test.AssertionsKt__AssertionsKt", "assert.*|fail.*|expect")
+    .add("kotlin.test.AssertionsKt__AssertionsKt", "assert.*|fail.*|expect") // for K1
+    .add("kotlin.test.AssertionsKt", "assert.*|fail.*|expect") // for K2
     .add("org.testng.Assert", "assert.*|fail.*|expect.*")
     .add("org.testng.AssertJUnit", "assert.*|fail.*")
     .finishDefault()
diff --git a/jvm/jvm-analysis-kotlin-tests-k2/testSrc/com/intellij/codeInspection/tests/kotlin/test/K2TestMethodWithoutAssertionInspectionTest.kt b/jvm/jvm-analysis-kotlin-tests-k2/testSrc/com/intellij/codeInspection/tests/kotlin/test/K2TestMethodWithoutAssertionInspectionTest.kt
index cba6ff646fa6..e43b8b2a81cb 100644
--- a/jvm/jvm-analysis-kotlin-tests-k2/testSrc/com/intellij/codeInspection/tests/kotlin/test/K2TestMethodWithoutAssertionInspectionTest.kt
+++ b/jvm/jvm-analysis-kotlin-tests-k2/testSrc/com/intellij/codeInspection/tests/kotlin/test/K2TestMethodWithoutAssertionInspectionTest.kt
@@ -1,11 +1,7 @@
 package com.intellij.codeInspection.tests.kotlin.test
 
-import com.intellij.idea.IgnoreJUnit3
 import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
-import org.junit.Ignore
 
-@Ignore
-@IgnoreJUnit3
 class K2TestMethodWithoutAssertionInspectionTest : KotlinTestMethodWithoutAssertionInspectionTest() {
   override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
 }
\ No newline at end of file
diff --git a/jvm/jvm-analysis-kotlin-tests-shared/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestMethodWithoutAssertionInspectionTest.kt b/jvm/jvm-analysis-kotlin-tests-shared/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestMethodWithoutAssertionInspectionTest.kt
index 1a623ba74fb0..34ad71a971ad 100644
--- a/jvm/jvm-analysis-kotlin-tests-shared/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestMethodWithoutAssertionInspectionTest.kt
+++ b/jvm/jvm-analysis-kotlin-tests-shared/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestMethodWithoutAssertionInspectionTest.kt
@@ -2,31 +2,14 @@ package com.intellij.codeInspection.tests.kotlin.test
 
 import com.intellij.jvm.analysis.internal.testFramework.test.TestMethodWithoutAssertionInspectionTestBase
 import com.intellij.jvm.analysis.testFramework.JvmLanguage
-import com.intellij.openapi.module.Module
-import com.intellij.openapi.roots.ContentEntry
-import com.intellij.openapi.roots.ModifiableRootModel
-import com.intellij.pom.java.LanguageLevel
-import com.intellij.project.IntelliJProjectConfiguration
-import com.intellij.testFramework.LightProjectDescriptor
-import com.intellij.testFramework.PsiTestUtil
-import com.intellij.util.PathUtil
+import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
 import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider
 import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin
-import java.io.File
 
 abstract class KotlinTestMethodWithoutAssertionInspectionTest : TestMethodWithoutAssertionInspectionTestBase(), ExpectedPluginModeProvider {
   override fun setUp() {
     setUpWithKotlinPlugin(testRootDisposable) { super.setUp() }
-  }
-
-  override fun getProjectDescriptor(): LightProjectDescriptor = object : TestFrameworkDescriptor(LanguageLevel.HIGHEST) {
-    override fun configureModule(module: Module, model: ModifiableRootModel, contentEntry: ContentEntry) {
-      super.configureModule(module, model, contentEntry)
-      val stdLibJar = File(PathUtil.getJarPathForClass(JvmStatic::class.java))
-      PsiTestUtil.addLibrary(model, "kotlin-stdlib", stdLibJar.parent, stdLibJar.name)
-      val ktTestJar = File(IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("kotlin-test").first())
-      PsiTestUtil.addLibrary(model, "kotlin-test", ktTestJar.parent, ktTestJar.name)
-    }
+    ConfigLibraryUtil.configureKotlinRuntime(myFixture.module)
   }
 
   fun `test highlighting for empty method body`() {