[kotlin] Run Kotlin JVM tests on both K1 and K2 frontend

#IDEA-354810 Fixed (cherry picked from commit d29d3256472dfe368161335732ded20ae95cf34e) IJ-MR-140910 GitOrigin-RevId: 0a9b3cae7aab473f732012ad91b4e67f97ff8697
2026-09-27 10:03:11 +07:00 · 2024-08-02 11:11:07 +00:00
parent db79e0d621
commit 72b748d5e0
290 changed files with 1604 additions and 844 deletions
@@ -488,7 +488,9 @@
      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml" />
      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-internal-testFramework/intellij.jvm.analysis.internal.testFramework.iml" />
      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests-k1/intellij.jvm.analysis.kotlin.tests.k1.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests-k2/intellij.jvm.analysis.kotlin.tests.k2.iml" />
+      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests-shared/intellij.jvm.analysis.kotlin.tests.shared.iml" />
      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-quickFix/intellij.jvm.analysis.quickFix.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-quickFix/intellij.jvm.analysis.quickFix.iml" />
      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-refactoring/intellij.jvm.analysis.refactoring.iml" />
      <module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-testFramework/intellij.jvm.analysis.testFramework.iml" />
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlin.plugin.k1" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="kotlin.base.plugin" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.jvm.analysis.kotlin.tests.shared" scope="TEST" />
+  </component>
+</module>
@@ -0,0 +1,14 @@
+package com.intellij
+
+import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider
+
+class K1PluginSanityTest : BasePlatformTestCase() {
+  fun testK1PluginEnabled() {
+    assertTrue(KotlinPluginModeProvider.isK1Mode())
+  }
+
+  fun testK2PluginDisabled() {
+    assertFalse(KotlinPluginModeProvider.isK2Mode())
+  }
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1BlockingCallDetectionTest : KotlinBlockingCallDetectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1CallMatcherTest : KotlinCallMatcherTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1DependencyInspectionTest : KotlinDependencyInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1EmptyMethodInspectionTest : KotlinEmptyMethodInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1JavaApiUsageInspectionTest : KotlinJavaApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1MarkedForRemovalInspectionTest : KotlinMarkedForRemovalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1MigrationTest : KotlinMigrationTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1MissingDeprecatedAnnotationOnScheduledForRemovalApiInspectionTest : KotlinMissingDeprecatedAnnotationOnScheduledForRemovalApiInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1MustAlreadyBeRemovedApiInspectionTest : KotlinMustAlreadyBeRemovedApiInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1NonExtendableApiUsageInspectionTest : KotlinNonExtendableApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1NonNlsUastUtilTest : KotlinNonNlsUastUtilTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1ObsoleteApiUsageInspectionTest : KotlinObsoleteApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1OverrideOnlyInspectionTest : KotlinOverrideOnlyInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,8 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1RedundantRequiresStatementTest : KotlinRedundantRequiresStatementTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SameParameterValueGlobalInspectionTest : KotlinSameParameterValueGlobalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SameParameterValueLocalInspectionTest : KotlinSameParameterValueLocalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SameReturnValueGlobalInspectionTest : KotlinSameReturnValueGlobalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SameReturnValueLocalInspectionTest : KotlinSameReturnValueLocalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SerializableHasSerialVersionUidFieldInspectionTest : KotlinSerializableHasSerialVersionUidFieldInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SuppressionAnnotationInspectionTest : KotlinSuppressionAnnotationInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SuspiciousPackagePrivateAccessInspectionTest : KotlinSuspiciousPackagePrivateAccessInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SystemGetPropertyInspectionTest : KotlinSystemGetPropertyInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1ThreadRunInspectionTest : KotlinThreadRunInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,8 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1UnstableApiUsageInspectionTest : KotlinUnstableApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1UnstableTypeUsedInSignatureTest : KotlinUnstableTypeUsedInSignatureTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1UnusedDeclarationTest : KotlinUnusedDeclarationTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1UnusedReturnValueInspectionTest : KotlinUnusedReturnValueInspectionKtTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.deadCode
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1AssertJImplicitUsageProviderTest : KotlinAssertJImplicitUsageProviderTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.deadCode
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1EasyMockImplicitUsageProviderTest : KotlinEasyMockImplicitUsageProviderTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.deadCode
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1MockitoImplicitUsageProviderTest : KotlinMockitoImplicitUsageProviderTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingConditionDisagreesWithLogLevelStatementInspectionTest : KotlinLoggingConditionDisagreesWithLogLevelStatementInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingGuardedByConditionInspectionTest : KotlinLoggingGuardedByConditionInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingPlaceholderCountMatchesArgumentCountInspectionLog4J2Test : KotlinLoggingPlaceholderCountMatchesArgumentCountInspectionLog4J2Test() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingPlaceholderCountMatchesArgumentCountInspectionPlaceholderNumberTest : KotlinLoggingPlaceholderCountMatchesArgumentCountInspectionPlaceholderNumberTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingPlaceholderCountMatchesArgumentCountInspectionSlf4JTest : KotlinLoggingPlaceholderCountMatchesArgumentCountInspectionSlf4JTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,8 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingSimilarMessageInspectionTest : KotlinLoggingSimilarMessageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
+
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingStatementNotGuardedByLogConditionInspectionTest : KotlinLoggingStatementNotGuardedByLogConditionInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingStringTemplateAsArgumentInspectionTest : KotlinLoggingStringTemplateAsArgumentInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.performance
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1UrlHashCodeInspectionTest : KotlinUrlHashCodeInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.sourceToSink
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1MarkAsSafeFixSourceToSinkFlowInspectionTest : KotlinMarkAsSafeFixSourceToSinkFlowInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.sourceToSink
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1SourceToSinkFlowInspectionTest : KotlinSourceToSinkFlowInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,12 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.runners.BlockJUnit4ClassRunner
+
+@RunWith(BlockJUnit4ClassRunner::class)
+@Ignore("IDEA-348567")
+class K1AssertEqualsBetweenInconvertibleTypesInspectionTest : KotlinAssertEqualsBetweenInconvertibleTypesInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1TestCaseWithConstructorInspectionTest : KotlinTestCaseWithConstructorInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1TestCaseWithoutTestsInspectionTest : KotlinTestCaseWithoutTestsInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1TestFailedLineInspectionTest : KotlinTestFailedLineInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1TestMethodWithoutAssertionInspectionTest : KotlinTestMethodWithoutAssertionInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1TestOnlyInspectionTest : KotlinTestOnlyInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.customization.console
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LogFinderHyperlinkTest : KotlinLogFinderHyperlinkTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.logging.highlighting
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingPlaceholderAnnotatorTest : KotlinLoggingPlaceholderAnnotatorTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,7 @@
+package com.intellij.logging.resolve
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1LoggingArgumentSymbolReferenceProviderTest : KotlinLoggingArgumentSymbolReferenceProviderTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,8 @@
+// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.refactoring.rename
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K1AutomaticTestMethodRenamerTest : KotlinAutomaticTestMethodRenamerTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K1
+}
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlin.plugin.k2" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.jvm.analysis.kotlin.tests.shared" scope="TEST" />
+  </component>
+</module>
@@ -0,0 +1,14 @@
+package com.intellij
+
+import com.intellij.testFramework.fixtures.BasePlatformTestCase
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider
+
+class K2PluginSanityTest : BasePlatformTestCase() {
+  fun testK2PluginEnabled() {
+    assertTrue(KotlinPluginModeProvider.isK2Mode())
+  }
+
+  fun testK1PluginDisabled() {
+    assertFalse(KotlinPluginModeProvider.isK1Mode())
+  }
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2BlockingCallDetectionTest : KotlinBlockingCallDetectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2CallMatcherTest : KotlinCallMatcherTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2DependencyInspectionTest : KotlinDependencyInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2EmptyMethodInspectionTest : KotlinEmptyMethodInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2JavaApiUsageInspectionTest : KotlinJavaApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2MarkedForRemovalInspectionTest : KotlinMarkedForRemovalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2MigrationTest : KotlinMigrationTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2MissingDeprecatedAnnotationOnScheduledForRemovalApiInspectionTest : KotlinMissingDeprecatedAnnotationOnScheduledForRemovalApiInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2MustAlreadyBeRemovedApiInspectionTest : KotlinMustAlreadyBeRemovedApiInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2NonExtendableApiUsageInspectionTest : KotlinNonExtendableApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2NonNlsUastUtilTest : KotlinNonNlsUastUtilTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2ObsoleteApiUsageInspectionTest : KotlinObsoleteApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2OverrideOnlyInspectionTest : KotlinOverrideOnlyInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,8 @@
+// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2RedundantRequiresStatementTest : KotlinRedundantRequiresStatementTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SameParameterValueGlobalInspectionTest : KotlinSameParameterValueGlobalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SameParameterValueLocalInspectionTest : KotlinSameParameterValueLocalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SameReturnValueGlobalInspectionTest : KotlinSameReturnValueGlobalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SameReturnValueLocalInspectionTest : KotlinSameReturnValueLocalInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SerializableHasSerialVersionUidFieldInspectionTest : KotlinSerializableHasSerialVersionUidFieldInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SuppressionAnnotationInspectionTest : KotlinSuppressionAnnotationInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SuspiciousPackagePrivateAccessInspectionTest : KotlinSuspiciousPackagePrivateAccessInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SystemGetPropertyInspectionTest : KotlinSystemGetPropertyInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2ThreadRunInspectionTest : KotlinThreadRunInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,8 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2UnstableApiUsageInspectionTest : KotlinUnstableApiUsageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2UnstableTypeUsedInSignatureTest : KotlinUnstableTypeUsedInSignatureTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2UnusedDeclarationTest : KotlinUnusedDeclarationTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2UnusedReturnValueInspectionTest : KotlinUnusedReturnValueInspectionKtTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.deadCode
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2AssertJImplicitUsageProviderTest : KotlinAssertJImplicitUsageProviderTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.deadCode
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2EasyMockImplicitUsageProviderTest : KotlinEasyMockImplicitUsageProviderTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.deadCode
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2MockitoImplicitUsageProviderTest : KotlinMockitoImplicitUsageProviderTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingConditionDisagreesWithLogLevelStatementInspectionTest : KotlinLoggingConditionDisagreesWithLogLevelStatementInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingGuardedByConditionInspectionTest : KotlinLoggingGuardedByConditionInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingPlaceholderCountMatchesArgumentCountInspectionLog4J2Test : KotlinLoggingPlaceholderCountMatchesArgumentCountInspectionLog4J2Test() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingPlaceholderCountMatchesArgumentCountInspectionPlaceholderNumberTest : KotlinLoggingPlaceholderCountMatchesArgumentCountInspectionPlaceholderNumberTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingPlaceholderCountMatchesArgumentCountInspectionSlf4JTest : KotlinLoggingPlaceholderCountMatchesArgumentCountInspectionSlf4JTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,8 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingSimilarMessageInspectionTest : KotlinLoggingSimilarMessageInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
+
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingStatementNotGuardedByLogConditionInspectionTest : KotlinLoggingStatementNotGuardedByLogConditionInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.logging
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2LoggingStringTemplateAsArgumentInspectionTest : KotlinLoggingStringTemplateAsArgumentInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.performance
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2UrlHashCodeInspectionTest : KotlinUrlHashCodeInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.sourceToSink
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2MarkAsSafeFixSourceToSinkFlowInspectionTest : KotlinMarkAsSafeFixSourceToSinkFlowInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.sourceToSink
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2SourceToSinkFlowInspectionTest : KotlinSourceToSinkFlowInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,12 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+import org.junit.Ignore
+import org.junit.runner.RunWith
+import org.junit.runners.BlockJUnit4ClassRunner
+
+@RunWith(BlockJUnit4ClassRunner::class)
+@Ignore("IDEA-348567")
+class K2AssertEqualsBetweenInconvertibleTypesInspectionTest : KotlinAssertEqualsBetweenInconvertibleTypesInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2TestCaseWithConstructorInspectionTest : KotlinTestCaseWithConstructorInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
@@ -0,0 +1,7 @@
+package com.intellij.codeInspection.tests.kotlin.test
+
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+
+class K2TestCaseWithoutTestsInspectionTest : KotlinTestCaseWithoutTestsInspectionTest() {
+  override val pluginMode: KotlinPluginMode get() = KotlinPluginMode.K2
+}
--- a/Show More
+++ b/Show More