From ac893e67753ed58ef56b44ddb70bb72c96a52a6a Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 2 Oct 2025 20:08:49 +0200 Subject: [PATCH] [kotlin] KTIJ-31690: rename option to support k2 by default - pass k1 mode explicitly where it was missed GitOrigin-RevId: c4c7b2aa658094623e15af2685f2a0c3f6799048 --- .../codeInsight/KtActionReferenceTest.kt | 9 +++++- ...RequiresBlockingContextInspectionKtTest.kt | 4 ++- ...denInSuspectContextMethodInspectionTest.kt | 11 +++++++- ...tCancellationCheckInLoopsInspectionTest.kt | 8 ++++-- .../KtCapitalizationInspectionTest.kt | 10 ++++++- .../inspections/KtI18NInspectionTest.kt | 10 ++++++- ...CanceledExceptionHandlingInspectionTest.kt | 8 ++++-- .../KtJComponentDataProviderInspectionTest.kt | 9 +++++- ...dLightServiceLevelAndCtorInspectionTest.kt | 9 +++++- .../KtPluginConfigReferenceTest.java | 15 +++++++++- ...ckInServiceInitializationInspectionTest.kt | 9 +++++- .../KtFileEqualsUsageInspectionTest.kt | 10 ++++++- .../MissingRecentApiInspectionTest.kt | 8 ++++-- .../PathAnnotationInspectionKotlinTest.kt | 10 ++++++- .../KtInsertCancellationCheckFixTest.kt | 8 ++++-- ...lifiableServiceRetrievingInspectionTest.kt | 9 +++++- ...lizableTypeInRpcInterfaceInspectionTest.kt | 8 ++++-- ...aceDoesNotExtendRemoteApiInspectionTest.kt | 8 ++++-- .../devkit/kotlin/quickfix/KtI18nizeTest.kt | 9 +++++- .../devkit/kotlin/util/ServiceUtilTest.kt | 8 ++++-- .../kotlin/base/analysis/tests/BUILD.bazel | 1 + .../tests/kotlin.base.analysis.tests.iml | 1 + .../test/AbstractModuleInfoCacheTest.kt | 9 ++++-- .../shared/RunBlockingInspectionTest.kt | 28 +++++++++++-------- .../compiler-plugin-support/tests/BUILD.bazel | 3 ++ ...-plugins.compiler-plugin-support.tests.iml | 2 ++ .../test/confidence/KotlinConfidenceTest.java | 13 +++++++-- .../highlighting-shared/tests/BUILD.bazel | 3 ++ .../kotlin.highlighting.shared.tests.iml | 2 ++ .../KotlinHighlightingUtilsTest.kt | 10 ++++++- plugins/kotlin/i18n/tests/BUILD.bazel | 3 ++ .../kotlin/i18n/tests/kotlin.i18n.tests.iml | 2 ++ .../kotlin/idea/i18n/I18nReferencesTest.kt | 19 +++++++++---- .../formatter/KotlinCodeStyleSettingsTest.kt | 12 +++++++- .../idea/DummyFileResolveCachingTest.kt | 11 +++++++- .../idea/actions/NewKotlinFileActionTest.kt | 10 ++++++- .../actions/NewKotlinFileNameValidatorTest.kt | 6 +++- .../idea/caches/resolve/IdeaModuleInfoTest.kt | 9 ++++-- .../StdlibJsDetectorFacilityTest.kt | 2 ++ .../CommonIntentionActionsParametersTest.kt | 9 ++++-- .../quickfix/CommonIntentionActionsTest.kt | 11 +++++++- .../GradleKotlinNewProjectWizardTest.kt | 4 +++ 42 files changed, 293 insertions(+), 57 deletions(-) diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/codeInsight/KtActionReferenceTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/codeInsight/KtActionReferenceTest.kt index 730e87bc2412..d605816f2dd0 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/codeInsight/KtActionReferenceTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/codeInsight/KtActionReferenceTest.kt @@ -17,9 +17,16 @@ import com.intellij.ui.components.JBList import com.intellij.util.PathUtil import org.jetbrains.idea.devkit.inspections.UnresolvedPluginConfigReferenceInspection import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @TestDataPath("\$CONTENT_ROOT/testData/codeInsight/actionReference") -class KtActionReferenceTest : JavaCodeInsightFixtureTestCase() { +class KtActionReferenceTest : JavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } override fun getBasePath(): String { return DevkitKtTestsUtil.TESTDATA_PATH + "codeInsight/actionReference" diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/CallingMethodShouldBeRequiresBlockingContextInspectionKtTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/CallingMethodShouldBeRequiresBlockingContextInspectionKtTest.kt index f40d7fe77c9c..d6326965232a 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/CallingMethodShouldBeRequiresBlockingContextInspectionKtTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/CallingMethodShouldBeRequiresBlockingContextInspectionKtTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.idea.devkit.kotlin.inspections import com.intellij.openapi.util.IntellijInternalApi import org.jetbrains.idea.devkit.inspections.CallingMethodShouldBeRequiresBlockingContextInspection +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -12,7 +13,8 @@ import org.junit.runners.JUnit4 import kotlin.test.assertNotNull as assertNotNullK @RunWith(JUnit4::class) -class CallingMethodShouldBeRequiresBlockingContextInspectionKtTest : KtBlockingContextInspectionTestCase() { +class CallingMethodShouldBeRequiresBlockingContextInspectionKtTest : KtBlockingContextInspectionTestCase(), ExpectedPluginModeProvider { + @Before fun enableInspection() { myFixture.enableInspections(CallingMethodShouldBeRequiresBlockingContextInspection::class.java) diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/ForbiddenInSuspectContextMethodInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/ForbiddenInSuspectContextMethodInspectionTest.kt index c8e5d756fe78..74e4eac76a8e 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/ForbiddenInSuspectContextMethodInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/ForbiddenInSuspectContextMethodInspectionTest.kt @@ -11,6 +11,9 @@ import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.kotlin.withKotlinStdlib +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.junit.Before import org.junit.Test import org.junit.runner.RunWith @@ -754,7 +757,13 @@ class ForbiddenInSuspectContextMethodInspectionTest : KtBlockingContextInspectio } @RunWith(JUnit4::class) -abstract class KtBlockingContextInspectionTestCase : LightJavaCodeInsightFixtureTestCase() { +abstract class KtBlockingContextInspectionTestCase : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } + override fun getProjectDescriptor(): LightProjectDescriptor = PROJECT_DESCRIPTOR_WITH_KOTLIN @Before diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCancellationCheckInLoopsInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCancellationCheckInLoopsInspectionTest.kt index de8e74c6adfe..7579fbc4b321 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCancellationCheckInLoopsInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCancellationCheckInLoopsInspectionTest.kt @@ -4,16 +4,20 @@ package org.jetbrains.idea.devkit.kotlin.inspections import com.intellij.testFramework.TestDataPath import org.jetbrains.idea.devkit.inspections.CancellationCheckInLoopsInspectionTestBase import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @TestDataPath("\$CONTENT_ROOT/testData/inspections/cancellationCheckInLoops") -class KtCancellationCheckInLoopsInspectionTest : CancellationCheckInLoopsInspectionTestBase() { +class KtCancellationCheckInLoopsInspectionTest : CancellationCheckInLoopsInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 override fun getFileExtension(): String = "kt" override fun getBasePath() = DevkitKtTestsUtil.TESTDATA_PATH + "inspections/cancellationCheckInLoops" override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } myFixture.addFileToProject( "Coroutines.kt", //language=kotlin diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCapitalizationInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCapitalizationInspectionTest.kt index 2b64117e520e..56725e4788e1 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCapitalizationInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtCapitalizationInspectionTest.kt @@ -3,8 +3,16 @@ package org.jetbrains.idea.devkit.kotlin.inspections import com.intellij.codeInspection.i18n.TitleCapitalizationInspection import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin + +class KtCapitalizationInspectionTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } -class KtCapitalizationInspectionTest : LightJavaCodeInsightFixtureTestCase() { fun testBasic() { myFixture.enableInspections(TitleCapitalizationInspection()) myFixture.configureByText("Foo.kt", """ diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtI18NInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtI18NInspectionTest.kt index d23553b5f6d2..3e0feb917ca3 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtI18NInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtI18NInspectionTest.kt @@ -8,8 +8,16 @@ import com.intellij.psi.PsiClassOwner import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import org.jetbrains.annotations.Nls +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin + +class KtI18NInspectionTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } -class KtI18NInspectionTest : LightJavaCodeInsightFixtureTestCase() { override fun getProjectDescriptor(): LightProjectDescriptor { return JAVA_8 } diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtIncorrectProcessCanceledExceptionHandlingInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtIncorrectProcessCanceledExceptionHandlingInspectionTest.kt index 8b3267dce481..f33c32e7eac8 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtIncorrectProcessCanceledExceptionHandlingInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtIncorrectProcessCanceledExceptionHandlingInspectionTest.kt @@ -5,11 +5,15 @@ import com.intellij.testFramework.TestDataPath import org.intellij.lang.annotations.Language import org.jetbrains.idea.devkit.inspections.IncorrectCancellationExceptionHandlingInspectionTestBase import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin -abstract class KtIncorrectCancellationExceptionHandlingInspectionTestBase : IncorrectCancellationExceptionHandlingInspectionTestBase() { +abstract class KtIncorrectCancellationExceptionHandlingInspectionTestBase : IncorrectCancellationExceptionHandlingInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } addKotlinFile("JvmPlatformAnnotations.kt", """ package kotlin.jvm import kotlin.reflect.KClass diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtJComponentDataProviderInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtJComponentDataProviderInspectionTest.kt index 5c0ee7e2e07b..34ee96eadddc 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtJComponentDataProviderInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtJComponentDataProviderInspectionTest.kt @@ -4,9 +4,16 @@ package org.jetbrains.idea.devkit.kotlin.inspections import com.intellij.testFramework.TestDataPath import org.jetbrains.idea.devkit.inspections.JComponentDataProviderInspectionTestBase import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @TestDataPath("\$CONTENT_ROOT/testData/inspections/jComponentDataProvider") -class KtJComponentDataProviderInspectionTest : JComponentDataProviderInspectionTestBase() { +class KtJComponentDataProviderInspectionTest : JComponentDataProviderInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } override fun getFileExtension() = "kt" diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtMismatchedLightServiceLevelAndCtorInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtMismatchedLightServiceLevelAndCtorInspectionTest.kt index 5afb983ccb87..db0290f50bc7 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtMismatchedLightServiceLevelAndCtorInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtMismatchedLightServiceLevelAndCtorInspectionTest.kt @@ -5,9 +5,16 @@ import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.testFramework.TestDataPath import org.jetbrains.idea.devkit.inspections.quickfix.MismatchedLightServiceLevelAndCtorInspectionTestBase import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @TestDataPath("\$CONTENT_ROOT/testData/inspections/mismatchedLightServiceLevelAndCtor") -internal class KtMismatchedLightServiceLevelAndCtorInspectionTest : MismatchedLightServiceLevelAndCtorInspectionTestBase() { +internal class KtMismatchedLightServiceLevelAndCtorInspectionTest : MismatchedLightServiceLevelAndCtorInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } override fun getBasePath() = DevkitKtTestsUtil.TESTDATA_PATH + "inspections/mismatchedLightServiceLevelAndCtor/" diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginConfigReferenceTest.java b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginConfigReferenceTest.java index a59ee7eeeb1f..fd285b4b9f9f 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginConfigReferenceTest.java +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPluginConfigReferenceTest.java @@ -17,11 +17,24 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase; import com.intellij.ui.components.JBList; import com.intellij.util.IncorrectOperationException; import com.intellij.util.PathUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.devkit.inspections.UnresolvedPluginConfigReferenceInspection; import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil; +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode; +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider; +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProviderKt; @TestDataPath("$CONTENT_ROOT/testData/references/pluginConfigReference") -public class KtPluginConfigReferenceTest extends JavaCodeInsightFixtureTestCase { +public class KtPluginConfigReferenceTest extends JavaCodeInsightFixtureTestCase implements ExpectedPluginModeProvider { + @Override + public @NotNull KotlinPluginMode getPluginMode() { + return KotlinPluginMode.K1; + } + + @Override + protected void setUp() throws Exception { + ExpectedPluginModeProviderKt.setUpWithKotlinPlugin(this, () -> super.setUp()); + } @Override protected String getBasePath() { diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPotentialDeadlockInServiceInitializationInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPotentialDeadlockInServiceInitializationInspectionTest.kt index ec34208c395e..1b23782eac80 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPotentialDeadlockInServiceInitializationInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtPotentialDeadlockInServiceInitializationInspectionTest.kt @@ -2,8 +2,15 @@ package org.jetbrains.idea.devkit.kotlin.inspections import org.jetbrains.idea.devkit.inspections.PotentialDeadlockInServiceInitializationInspectionTestBase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin -class KtPotentialDeadlockInServiceInitializationInspectionTest : PotentialDeadlockInServiceInitializationInspectionTestBase() { +class KtPotentialDeadlockInServiceInitializationInspectionTest : PotentialDeadlockInServiceInitializationInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } fun `test read and write actions are reported in a light service`() { myFixture.configureByText("TestService.kt", getServiceWithReadAndWriteActionsCalledDuringInit(true)) diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/internal/KtFileEqualsUsageInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/internal/KtFileEqualsUsageInspectionTest.kt index 63f059b53fa8..8ae2131df55e 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/internal/KtFileEqualsUsageInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/internal/KtFileEqualsUsageInspectionTest.kt @@ -2,8 +2,16 @@ package org.jetbrains.idea.devkit.kotlin.inspections.internal import org.jetbrains.idea.devkit.inspections.internal.FileEqualsUsageInspectionTestBase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin + +class KtFileEqualsUsageInspectionTest : FileEqualsUsageInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } -class KtFileEqualsUsageInspectionTest : FileEqualsUsageInspectionTestBase() { fun testEquals() { doTest("equals(java.io.File(\"any\"))", true) } diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTest.kt index e5b6b56d1a59..471957c7a947 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/missingApi/MissingRecentApiInspectionTest.kt @@ -22,12 +22,16 @@ import org.jetbrains.idea.devkit.inspections.missingApi.MissingRecentApiInspecti import org.jetbrains.idea.devkit.inspections.missingApi.MissingRecentApiUsageProcessor import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil import org.jetbrains.idea.devkit.module.PluginModuleType +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin /** * Base class for tests of [MissingRecentApiInspection] on Java and Kotlin sources. */ @TestDataPath("\$CONTENT_ROOT/testData/inspections/missingApi") -class MissingRecentApiInspectionTest : PluginModuleTestCase() { +class MissingRecentApiInspectionTest : PluginModuleTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 private val projectDescriptor = object : LightJavaCodeInsightFixtureTestCase.ProjectDescriptor(LanguageLevel.HIGHEST) { override fun configureModule(module: Module, model: ModifiableRootModel, contentEntry: ContentEntry) { @@ -48,7 +52,7 @@ class MissingRecentApiInspectionTest : PluginModuleTestCase() { override fun getProjectDescriptor() = projectDescriptor override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } configureInspection() assertAnnotationsFoundForClass("library.RecentClass") assertAnnotationsFoundForClass("library.RecentKotlinClass") diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/path/PathAnnotationInspectionKotlinTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/path/PathAnnotationInspectionKotlinTest.kt index 0810d826ab24..b7214a7036fe 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/path/PathAnnotationInspectionKotlinTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/path/PathAnnotationInspectionKotlinTest.kt @@ -2,12 +2,20 @@ package org.jetbrains.idea.devkit.kotlin.inspections.path import org.jetbrains.idea.devkit.DevKitBundle +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin /** * Kotlin implementation of tests for PathAnnotationInspection. * Some tests might not pass because the inspection implementation might not fully support Kotlin. */ -class PathAnnotationInspectionKotlinTest : PathAnnotationInspectionKotlinTestBase() { +class PathAnnotationInspectionKotlinTest : PathAnnotationInspectionKotlinTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } + fun testFileSystemGetPath() { doTest(""" @file:Suppress("UNUSED_VARIABLE") diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtInsertCancellationCheckFixTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtInsertCancellationCheckFixTest.kt index e69ed87b3f0c..14982adfea2c 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtInsertCancellationCheckFixTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtInsertCancellationCheckFixTest.kt @@ -5,16 +5,20 @@ import com.intellij.testFramework.TestDataPath import org.jetbrains.idea.devkit.DevKitBundle import org.jetbrains.idea.devkit.inspections.CancellationCheckInLoopsInspectionTestBase import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @TestDataPath("\$CONTENT_ROOT/testData/inspections/insertCancellationCheckFix") -class KtInsertCancellationCheckFixTest : CancellationCheckInLoopsInspectionTestBase() { +class KtInsertCancellationCheckFixTest : CancellationCheckInLoopsInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 override fun getFileExtension(): String = "kt" override fun getBasePath() = DevkitKtTestsUtil.TESTDATA_PATH + "inspections/insertCancellationCheckFix" override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } myFixture.addFileToProject( "Coroutines.kt", //language=kotlin diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtSimplifiableServiceRetrievingInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtSimplifiableServiceRetrievingInspectionTest.kt index 202c0c114a34..0bfbdac75080 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtSimplifiableServiceRetrievingInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/quickfix/KtSimplifiableServiceRetrievingInspectionTest.kt @@ -5,9 +5,16 @@ import com.intellij.testFramework.TestDataPath import org.jetbrains.idea.devkit.DevKitBundle import org.jetbrains.idea.devkit.inspections.quickfix.SimplifiableServiceRetrievingInspectionTestBase import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @TestDataPath("\$CONTENT_ROOT/testData/inspections/simplifiableServiceRetrieving") -internal class KtSimplifiableServiceRetrievingInspectionTest : SimplifiableServiceRetrievingInspectionTestBase() { +internal class KtSimplifiableServiceRetrievingInspectionTest : SimplifiableServiceRetrievingInspectionTestBase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } override fun getBasePath() = DevkitKtTestsUtil.TESTDATA_PATH + "inspections/simplifiableServiceRetrieving/" diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/NonSerializableTypeInRpcInterfaceInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/NonSerializableTypeInRpcInterfaceInspectionTest.kt index dbb806d1aaf9..8d27381a5b12 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/NonSerializableTypeInRpcInterfaceInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/NonSerializableTypeInRpcInterfaceInspectionTest.kt @@ -5,6 +5,9 @@ import com.intellij.psi.PsiFile import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import org.intellij.lang.annotations.Language +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @Language("kotlin") private const val FLEET_RPC_API = """ @@ -35,10 +38,11 @@ annotation class Serializable( annotation class Transient """ -class NonSerializableTypeInRpcInterfaceInspectionTest : LightJavaCodeInsightFixtureTestCase() { +class NonSerializableTypeInRpcInterfaceInspectionTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } myFixture.enableInspections(NonSerializableTypeInRpcInterfaceInspection()) myFixture.addFileToProject("fleet/rpc/Rpc.kt", FLEET_RPC_API) diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/RpcInterfaceDoesNotExtendRemoteApiInspectionTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/RpcInterfaceDoesNotExtendRemoteApiInspectionTest.kt index 2a8fc9964aa7..1f98abd0b2f8 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/RpcInterfaceDoesNotExtendRemoteApiInspectionTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/remotedev/RpcInterfaceDoesNotExtendRemoteApiInspectionTest.kt @@ -5,6 +5,9 @@ import com.intellij.psi.PsiFile import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import org.intellij.lang.annotations.Language +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin @Language("kotlin") private const val FLEET_RPC_API = """ @@ -16,10 +19,11 @@ interface RemoteApi annotation class Rpc """ -class RpcInterfaceDoesNotExtendRemoteApiInspectionTest : LightJavaCodeInsightFixtureTestCase() { +class RpcInterfaceDoesNotExtendRemoteApiInspectionTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } myFixture.enableInspections(RpcInterfaceDoesNotExtendRemoteApiInspection()) myFixture.addFileToProject("fleet/rpc/Rpc.kt", FLEET_RPC_API) diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/quickfix/KtI18nizeTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/quickfix/KtI18nizeTest.kt index de3a579cb9b9..181336b8f0c2 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/quickfix/KtI18nizeTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/quickfix/KtI18nizeTest.kt @@ -11,6 +11,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.command.WriteCommandAction import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import junit.framework.TestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.uast.UClass import org.jetbrains.uast.UExpression import org.jetbrains.uast.expressions.UStringConcatenationsFacade.Companion.createFromTopConcatenation @@ -22,7 +25,11 @@ private const val i18nizedExpr = "i18nizedExpr" /** * Analogical Java tests: [com.intellij.java.codeInsight.daemon.quickFix.I18nizeTest] */ -class KtI18nizeTest : LightJavaCodeInsightFixtureTestCase() { +class KtI18nizeTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } private fun doTest(before: String, expected: String? = null, i18nized: String = i18nizedExpr) { myFixture.configureByText("Test.kt", before) diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/util/ServiceUtilTest.kt b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/util/ServiceUtilTest.kt index 8f35ff5bf1fd..59e579586816 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/util/ServiceUtilTest.kt +++ b/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/util/ServiceUtilTest.kt @@ -10,6 +10,9 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import org.jetbrains.idea.devkit.inspections.LevelType import org.jetbrains.idea.devkit.inspections.getLevelType import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.uast.UClass import org.jetbrains.uast.getContainingUClass import org.jetbrains.uast.getParentOfType @@ -22,12 +25,13 @@ private const val SERVICE_DECLARATIONS_DIR = "serviceDeclarations" private const val SERVICE_USAGES_DIR = "serviceUsages" @TestDataPath("\$CONTENT_ROOT/testData/util/serviceUtil") -class ServiceUtilTest : LightJavaCodeInsightFixtureTestCase() { +class ServiceUtilTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 override fun getBasePath(): String = DevkitKtTestsUtil.TESTDATA_PATH + "util/serviceUtil" override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } addPlatformClasses() myFixture.configureByFile("plugin.xml") } diff --git a/plugins/kotlin/base/analysis/tests/BUILD.bazel b/plugins/kotlin/base/analysis/tests/BUILD.bazel index b86f8fc6134c..7383c1775e0a 100644 --- a/plugins/kotlin/base/analysis/tests/BUILD.bazel +++ b/plugins/kotlin/base/analysis/tests/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//plugins/kotlin/base/util", "//plugins/kotlin/base/util:util_test_lib", "@lib//:junit4", + "//plugins/kotlin/base/test:test_test_lib", ] ) ### auto-generated section `build kotlin.base.analysis.tests` end diff --git a/plugins/kotlin/base/analysis/tests/kotlin.base.analysis.tests.iml b/plugins/kotlin/base/analysis/tests/kotlin.base.analysis.tests.iml index 1fff518912bc..555ee60aebe9 100644 --- a/plugins/kotlin/base/analysis/tests/kotlin.base.analysis.tests.iml +++ b/plugins/kotlin/base/analysis/tests/kotlin.base.analysis.tests.iml @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/plugins/kotlin/base/analysis/tests/test/org/jetbrains/kotlin/idea/base/analysis/test/AbstractModuleInfoCacheTest.kt b/plugins/kotlin/base/analysis/tests/test/org/jetbrains/kotlin/idea/base/analysis/test/AbstractModuleInfoCacheTest.kt index 673139bd5c1b..f0c3e97e44e2 100644 --- a/plugins/kotlin/base/analysis/tests/test/org/jetbrains/kotlin/idea/base/analysis/test/AbstractModuleInfoCacheTest.kt +++ b/plugins/kotlin/base/analysis/tests/test/org/jetbrains/kotlin/idea/base/analysis/test/AbstractModuleInfoCacheTest.kt @@ -10,16 +10,21 @@ import com.intellij.openapi.roots.ContentEntry import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.testFramework.JavaModuleTestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.base.projectStructure.moduleInfo.ModuleProductionSourceInfo import org.jetbrains.kotlin.idea.base.projectStructure.moduleInfo.ModuleTestSourceInfo import org.jetbrains.kotlin.idea.base.projectStructure.moduleInfo.SdkInfo import org.jetbrains.kotlin.idea.base.util.K1ModeProjectStructureApi import org.jetbrains.kotlin.idea.caches.project.IdeaModelInfosCache +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import java.io.File -abstract class AbstractModuleInfoCacheTest : JavaModuleTestCase() { +abstract class AbstractModuleInfoCacheTest : JavaModuleTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } getOrCreateProjectBaseDir() } diff --git a/plugins/kotlin/code-insight/inspections-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/inspections/shared/RunBlockingInspectionTest.kt b/plugins/kotlin/code-insight/inspections-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/inspections/shared/RunBlockingInspectionTest.kt index e896194ebf92..f3700ca54829 100644 --- a/plugins/kotlin/code-insight/inspections-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/inspections/shared/RunBlockingInspectionTest.kt +++ b/plugins/kotlin/code-insight/inspections-shared/tests/k1/test/org/jetbrains/kotlin/idea/codeInsight/inspections/shared/RunBlockingInspectionTest.kt @@ -13,15 +13,19 @@ import com.intellij.testFramework.fixtures.DefaultLightProjectDescriptor import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.MavenDependencyUtil import org.jdom.Element +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.base.test.KotlinRoot import org.jetbrains.kotlin.idea.codeInsight.inspections.shared.runBlocking.RunBlockingInspection +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.kotlin.util.collectionUtils.concat import org.junit.jupiter.api.* import org.junit.jupiter.api.DynamicTest.dynamicTest import java.io.File @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class RunBlockingInspectionTest { +class RunBlockingInspectionTest: ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 private val testDataDir = KotlinRoot.DIR.resolve("code-insight/inspections-shared/tests/testData/inspections/runBlocking").path private data class TraceElement(val fgName: String, val url: String, val fileAndLine: String) @@ -45,16 +49,18 @@ class RunBlockingInspectionTest { @BeforeAll fun initialize() { - testCase.setUp() - testCase.getFixture().testDataPath = testDataDir - val file = File("$testDataDir/inspectionData/tests.xml") - val expectedRoot: Element = JDOMUtil.load(file) - myTests = expectedRoot.getChildren("test").map {Test.fromElement(it)} - - val aggregatedInputFiles = myTests.fold(mutableListOf()) { acc, test -> acc.concat(test.inputFiles)!!.toMutableList() } - aggregatedInputFiles.forEach { input -> - val psiFile = testCase.getFixture().configureByFile(input) - psiFileMap[input] = psiFile + setUpWithKotlinPlugin(testCase.testRootDisposable) { + testCase.setUp() + testCase.getFixture().testDataPath = testDataDir + val file = File("$testDataDir/inspectionData/tests.xml") + val expectedRoot: Element = JDOMUtil.load(file) + myTests = expectedRoot.getChildren("test").map {Test.fromElement(it)} + + val aggregatedInputFiles = myTests.fold(mutableListOf()) { acc, test -> acc.concat(test.inputFiles)!!.toMutableList() } + aggregatedInputFiles.forEach { input -> + val psiFile = testCase.getFixture().configureByFile(input) + psiFileMap[input] = psiFile + } } } diff --git a/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/BUILD.bazel b/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/BUILD.bazel index 94eecf278b10..e9842d94cd2b 100644 --- a/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/BUILD.bazel +++ b/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/BUILD.bazel @@ -24,6 +24,9 @@ jvm_library( "//plugins/kotlin/base/facet", "//plugins/kotlin/base/facet/tests:tests_test_lib", "//plugins/kotlin/compiler-plugins/compiler-plugin-support/common", + "//plugins/kotlin/base/plugin", + "//plugins/kotlin/base/plugin:plugin_test_lib", + "//plugins/kotlin/base/test:test_test_lib", ] ) ### auto-generated section `build kotlin.compiler-plugins.compiler-plugin-support.tests` end diff --git a/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/kotlin.compiler-plugins.compiler-plugin-support.tests.iml b/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/kotlin.compiler-plugins.compiler-plugin-support.tests.iml index 554ac9ac18d4..8252642dbaf8 100644 --- a/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/kotlin.compiler-plugins.compiler-plugin-support.tests.iml +++ b/plugins/kotlin/compiler-plugins/compiler-plugin-support/tests/kotlin.compiler-plugins.compiler-plugin-support.tests.iml @@ -17,5 +17,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java index 647ab6f5aaf8..7f5f7fd9b6d7 100644 --- a/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java +++ b/plugins/kotlin/completion/tests-k1/test/org/jetbrains/kotlin/idea/completion/test/confidence/KotlinConfidenceTest.java @@ -20,7 +20,10 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.SystemProperties; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode; import org.jetbrains.kotlin.idea.completion.test.CompletionTestUtilKt; +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider; +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProviderKt; import org.jetbrains.kotlin.idea.test.TestUtilsKt; import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils; import org.junit.internal.runners.JUnit38ClassRunner; @@ -30,7 +33,12 @@ import java.io.File; import java.util.List; @RunWith(JUnit38ClassRunner.class) -public class KotlinConfidenceTest extends LightCompletionTestCase { +public class KotlinConfidenceTest extends LightCompletionTestCase implements ExpectedPluginModeProvider { + @Override + public @NotNull KotlinPluginMode getPluginMode() { + return KotlinPluginMode.K1; + } + private static final String TYPE_DIRECTIVE_PREFIX = "// TYPE:"; private final ThreadLocal skipComplete = ThreadLocal.withInitial(() -> false); @@ -76,7 +84,8 @@ public class KotlinConfidenceTest extends LightCompletionTestCase { @Override protected void setUp() throws Exception { - super.setUp(); + ExpectedPluginModeProviderKt.setUpWithKotlinPlugin(this, () -> super.setUp()); + TestUtilsKt.invalidateLibraryCache(getProject()); } diff --git a/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel b/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel index 6c0db1fc3c57..adf71c78a47e 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel +++ b/plugins/kotlin/highlighting/highlighting-shared/tests/BUILD.bazel @@ -25,6 +25,9 @@ jvm_library( "@lib//:kotlinc-kotlin-compiler-common", "//plugins/kotlin/highlighting/highlighting-shared:kotlin-highlighting-shared", "//platform/diff-impl", + "//plugins/kotlin/base/test:test_test_lib", + "//plugins/kotlin/base/plugin", + "//plugins/kotlin/base/plugin:plugin_test_lib", ] ) ### auto-generated section `build kotlin.highlighting.shared.tests` end diff --git a/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml b/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml index 868d8475b526..b8aced48a2b1 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml +++ b/plugins/kotlin/highlighting/highlighting-shared/tests/kotlin.highlighting.shared.tests.iml @@ -18,5 +18,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/highlighting/highlighting-shared/tests/test/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtilsTest.kt b/plugins/kotlin/highlighting/highlighting-shared/tests/test/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtilsTest.kt index 1d4aa97c3858..526b57a4f35b 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/tests/test/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtilsTest.kt +++ b/plugins/kotlin/highlighting/highlighting-shared/tests/test/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtilsTest.kt @@ -10,11 +10,19 @@ import com.intellij.psi.PsiManager import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.LightVirtualFile import org.jetbrains.kotlin.idea.KotlinLanguage +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.kotlin.psi.KtExpressionCodeFragment import org.jetbrains.kotlin.psi.KtFile import java.io.File -class KotlinHighlightingUtilsTest : LightPlatformTestCase() { +class KotlinHighlightingUtilsTest : LightPlatformTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } + private fun createKotlinFileAtPath(path: String): KtFile { val file = File(project.basePath, path.replace("/", File.separator)) file.parentFile.mkdirs() diff --git a/plugins/kotlin/i18n/tests/BUILD.bazel b/plugins/kotlin/i18n/tests/BUILD.bazel index 21c382eff904..9447c6bc4ba5 100644 --- a/plugins/kotlin/i18n/tests/BUILD.bazel +++ b/plugins/kotlin/i18n/tests/BUILD.bazel @@ -28,6 +28,9 @@ jvm_library( "//plugins/java-i18n:java-i18n_test_lib", "//plugins/properties/properties-psi-impl:backend-psi", "//plugins/kotlin/code-insight/api", + "//plugins/kotlin/base/test:test_test_lib", + "//plugins/kotlin/base/plugin", + "//plugins/kotlin/base/plugin:plugin_test_lib", ] ) ### auto-generated section `build kotlin.i18n.tests` end diff --git a/plugins/kotlin/i18n/tests/kotlin.i18n.tests.iml b/plugins/kotlin/i18n/tests/kotlin.i18n.tests.iml index 9a8dca498b11..1a5f8a769c77 100644 --- a/plugins/kotlin/i18n/tests/kotlin.i18n.tests.iml +++ b/plugins/kotlin/i18n/tests/kotlin.i18n.tests.iml @@ -20,5 +20,7 @@ + + \ No newline at end of file diff --git a/plugins/kotlin/i18n/tests/test/org/jetbrains/kotlin/idea/i18n/I18nReferencesTest.kt b/plugins/kotlin/i18n/tests/test/org/jetbrains/kotlin/idea/i18n/I18nReferencesTest.kt index c5366f48264c..59030708f502 100644 --- a/plugins/kotlin/i18n/tests/test/org/jetbrains/kotlin/idea/i18n/I18nReferencesTest.kt +++ b/plugins/kotlin/i18n/tests/test/org/jetbrains/kotlin/idea/i18n/I18nReferencesTest.kt @@ -4,19 +4,28 @@ package org.jetbrains.kotlin.idea.i18n import com.intellij.lang.properties.psi.Property import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.junit.Assert import org.junit.internal.runners.JUnit38ClassRunner import org.junit.runner.RunWith @RunWith(JUnit38ClassRunner::class) -class I18nReferencesTest : LightJavaCodeInsightFixtureTestCase() { +class I18nReferencesTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { - super.setUp() - myFixture.addClass("""package org.jetbrains.annotations; + setUpWithKotlinPlugin { + super.setUp() + myFixture.addClass( + """package org.jetbrains.annotations; import java.lang.annotation.*; @Target({ElementType.PARAMETER, ElementType.LOCAL_VARIABLE, ElementType.FIELD, ElementType.TYPE_USE}) -public @interface PropertyKey { String resourceBundle(); }""") - myFixture.addFileToProject("messages/MyBundle.properties", "key1=value1\nkey2=value2 {0}") +public @interface PropertyKey { String resourceBundle(); }""" + ) + myFixture.addFileToProject("messages/MyBundle.properties", "key1=value1\nkey2=value2 {0}") + } } fun testResolveResourceBundleKey() { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/KotlinCodeStyleSettingsTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/KotlinCodeStyleSettingsTest.kt index 820cab946d95..b41a45e7564d 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/KotlinCodeStyleSettingsTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/formatter/KotlinCodeStyleSettingsTest.kt @@ -10,15 +10,22 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager import com.intellij.psi.impl.source.codeStyle.json.CodeStyleSchemeJsonExporter import com.intellij.testFramework.LightPlatformTestCase import org.jdom.Element +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.core.formatter.KotlinPackageEntry import org.jetbrains.kotlin.idea.formatter.* +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.jetbrains.kotlin.idea.test.IDEA_TEST_DATA_DIR import org.jetbrains.kotlin.idea.test.KotlinTestUtils +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import java.io.ByteArrayOutputStream import java.io.File -class KotlinCodeStyleSettingsTest : LightPlatformTestCase() { +class KotlinCodeStyleSettingsTest : LightPlatformTestCase(), ExpectedPluginModeProvider { + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } + fun `test json export with official code style`() = doTestWithJson(KotlinStyleGuideCodeStyle.INSTANCE, "officialCodeStyle") fun `test json export with obsolete code style`() = doTestWithJson(KotlinObsoleteCodeStyle.INSTANCE, "obsoleteCodeStyle") @@ -105,6 +112,9 @@ class KotlinCodeStyleSettingsTest : LightPlatformTestCase() { assertTrue(copyOfSettings.kotlinCommonSettings == copyOfSettings.kotlinCommonSettings) assertTrue(copyOfSettings.kotlinCustomSettings == copyOfSettings.kotlinCustomSettings) } + + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + } private fun doTestWithJson(codeStyle: KotlinPredefinedCodeStyle, fileName: String) { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt index 9859036731e7..bfaa9806d1c6 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/DummyFileResolveCachingTest.kt @@ -3,8 +3,11 @@ package org.jetbrains.kotlin.idea import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.kotlin.idea.util.getFileResolutionScope import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name @@ -14,7 +17,13 @@ import org.junit.internal.runners.JUnit38ClassRunner import org.junit.runner.RunWith @RunWith(JUnit38ClassRunner::class) -class DummyFileResolveCachingTest : LightJavaCodeInsightFixtureTestCase() { +class DummyFileResolveCachingTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.getInstance() fun test() { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt index 764d53efd833..af7f65a00993 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileActionTest.kt @@ -3,8 +3,16 @@ package org.jetbrains.kotlin.idea.actions import com.intellij.ide.fileTemplates.impl.CustomFileTemplate import com.intellij.testFramework.fixtures.BasePlatformTestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin + +class NewKotlinFileActionTest : BasePlatformTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } -class NewKotlinFileActionTest : BasePlatformTestCase() { private val testTemplate = CustomFileTemplate("test template", "kt").apply { text = """ #if (${'$'}{PACKAGE_NAME} && ${'$'}{PACKAGE_NAME} != "")package ${'$'}{PACKAGE_NAME} diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileNameValidatorTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileNameValidatorTest.kt index 752e8c3f7645..3405341766f5 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileNameValidatorTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/actions/NewKotlinFileNameValidatorTest.kt @@ -3,16 +3,20 @@ package org.jetbrains.kotlin.idea.actions import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.junit.internal.runners.JUnit38ClassRunner import org.junit.runner.RunWith @RunWith(JUnit38ClassRunner::class) -class NewKotlinFileNameValidatorTest : LightJavaCodeInsightFixtureTestCase() { +class NewKotlinFileNameValidatorTest : LightJavaCodeInsightFixtureTestCase(), ExpectedPluginModeProvider { companion object { private const val EMPTY_PARTS_ERROR = "Name can't have empty parts" private const val EMPTY_ERROR = "Name can't be empty" } + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + fun testEmptyName() { validateName("", EMPTY_ERROR) } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt index deee4c37d1f4..8a9fa078e45f 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.idea.base.platforms.KotlinJavaScriptLibraryKind import org.jetbrains.kotlin.idea.base.platforms.KotlinWasmJsLibraryKind import org.jetbrains.kotlin.idea.base.platforms.KotlinWasmWasiLibraryKind import org.jetbrains.kotlin.idea.artifacts.TestKotlinArtifacts +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.base.projectStructure.* import org.jetbrains.kotlin.idea.base.projectStructure.libraryToSourceAnalysis.withLibraryToSourceAnalysis import org.jetbrains.kotlin.idea.base.projectStructure.moduleInfo.* @@ -42,6 +43,7 @@ import org.jetbrains.kotlin.idea.caches.project.getModuleInfosFromIdeaModel import org.jetbrains.kotlin.idea.core.script.k1.ScriptConfigurationManager.Companion.updateScriptDependenciesSynchronously import org.jetbrains.kotlin.idea.core.script.v1.ScriptDependenciesInfo import org.jetbrains.kotlin.idea.framework.KotlinSdkType +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.jetbrains.kotlin.idea.test.KotlinTestUtils.allowProjectRootAccess import org.jetbrains.kotlin.idea.test.KotlinTestUtils.disposeVfsRootAccess import org.jetbrains.kotlin.idea.test.PluginTestCaseBase @@ -49,6 +51,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase.addJdk import org.jetbrains.kotlin.idea.test.addDependency import org.jetbrains.kotlin.idea.test.createMultiplatformFacetM3 import org.jetbrains.kotlin.idea.test.runAll +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.kotlin.idea.util.application.executeOnPooledThread import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.platform.TargetPlatform @@ -75,7 +78,9 @@ import java.util.concurrent.TimeUnit import kotlin.test.assertContains @RunWith(JUnit38ClassRunner::class) -class IdeaModuleInfoTest8 : JavaModuleTestCase() { +class IdeaModuleInfoTest8 : JavaModuleTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + private var vfsDisposable: Ref? = null private fun getModuleInfoFromIdeaModuleWithJvmPlatformCheck(): List { @@ -2405,7 +2410,7 @@ class IdeaModuleInfoTest8 : JavaModuleTestCase() { } override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } vfsDisposable = allowProjectRootAccess(this) } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/StdlibJsDetectorFacilityTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/StdlibJsDetectorFacilityTest.kt index 552b30fcaf61..b0e3569223e7 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/StdlibJsDetectorFacilityTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/StdlibJsDetectorFacilityTest.kt @@ -15,9 +15,11 @@ import com.intellij.testFramework.junit5.fixture.TestFixture import com.intellij.testFramework.junit5.fixture.moduleFixture import com.intellij.testFramework.junit5.fixture.projectFixture import org.jetbrains.kotlin.idea.base.platforms.KotlinJavaScriptStdlibDetectorFacility +import org.jetbrains.kotlin.idea.test.UseK1PluginMode import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test +@UseK1PluginMode @TestApplication class StdlibJsDetectorFacilityTest { companion object { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt index ecab338f071e..0c9ed41d822a 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsParametersTest.kt @@ -8,19 +8,24 @@ import com.intellij.lang.jvm.types.JvmType import com.intellij.psi.PsiType import com.intellij.psi.PsiTypes import com.intellij.testFramework.fixtures.BasePlatformTestCase +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.uast.UMethod import org.junit.Assert import org.junit.internal.runners.JUnit38ClassRunner import org.junit.runner.RunWith @RunWith(JUnit38ClassRunner::class) -class CommonIntentionActionsParametersTest : BasePlatformTestCase() { +class CommonIntentionActionsParametersTest : BasePlatformTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.getInstanceFullJdk() override fun setUp() { - super.setUp() + setUpWithKotlinPlugin { super.setUp() } myFixture.configureByText("Anno.kt", "annotation class Anno(val i: Int)") myFixture.configureByText("ClassRef.kt", "annotation class ClassRef(val klass: KClass<*>)") myFixture.configureByText("Root.kt", "annotation class Root(val children: Array") diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt index 4d4a3bcacc11..73323de13b45 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt @@ -15,8 +15,11 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture import junit.framework.TestCase import org.intellij.lang.annotations.Language import org.jetbrains.kotlin.asJava.toLightElements +import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode import org.jetbrains.kotlin.idea.base.util.allScope +import org.jetbrains.kotlin.idea.test.ExpectedPluginModeProvider import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.test.setUpWithKotlinPlugin import org.jetbrains.kotlin.psi.KtModifierListOwner import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.uast.toUElement @@ -25,7 +28,13 @@ import org.junit.internal.runners.JUnit38ClassRunner import org.junit.runner.RunWith @RunWith(JUnit38ClassRunner::class) -class CommonIntentionActionsTest : BasePlatformTestCase() { +class CommonIntentionActionsTest : BasePlatformTestCase(), ExpectedPluginModeProvider { + override val pluginMode: KotlinPluginMode = KotlinPluginMode.K1 + + override fun setUp() { + setUpWithKotlinPlugin { super.setUp() } + } + private class SimpleMethodRequest( project: Project, private val methodName: String, diff --git a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTest.kt b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTest.kt index 79fd12c7d022..d7e470587100 100644 --- a/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTest.kt +++ b/plugins/kotlin/project-wizard/tests/test/org/jetbrains/kotlin/tools/projectWizard/wizard/GradleKotlinNewProjectWizardTest.kt @@ -22,6 +22,10 @@ import kotlin.io.path.pathString import kotlin.io.path.walk class GradleKotlinNewProjectWizardTest : GradleKotlinNewProjectWizardTestCase() { + @Test + fun testK1PluginIsUsed() { + Assertions.assertTrue(System.getProperty("idea.kotlin.plugin.use.k1").toBoolean()) + } @ParameterizedTest @EnumSource(GradleDsl::class)