From be86dc3c784d39e32f1be66af336ab159b1b4e33 Mon Sep 17 00:00:00 2001 From: Alex Plate Date: Thu, 20 Feb 2025 19:15:43 +0200 Subject: [PATCH] Rename VimNoWriteActionTestCase to IdeaVimTestCase --- .../option/EffectiveOptionChangeListenerTest.kt | 4 ++-- .../plugins/ideavim/option/OptionDeclaredScopeTest.kt | 4 ++-- .../option/overrides/TextWidthOptionMapperTest.kt | 4 ++-- .../org/jetbrains/plugins/ideavim/VimTestCase.kt | 10 +++++----- .../org/jetbrains/plugins/ideavim/VimJavaTestCase.kt | 2 +- .../ideavim/propertybased/IncrementDecrementCheck.kt | 4 ++-- .../ideavim/propertybased/RandomActionsPropertyTest.kt | 4 ++-- .../ideavim/propertybased/YankDeletePropertyTest.kt | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt index 85594bfb55..ac32ea7f9c 100644 --- a/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt +++ b/src/test/java/org/jetbrains/plugins/ideavim/option/EffectiveOptionChangeListenerTest.kt @@ -33,7 +33,7 @@ import com.maddyhome.idea.vim.vimscript.model.datatypes.VimInt import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString import org.jetbrains.plugins.ideavim.SkipNeovimReason import org.jetbrains.plugins.ideavim.TestWithoutNeovim -import org.jetbrains.plugins.ideavim.VimNoWriteActionTestCase +import org.jetbrains.plugins.ideavim.IdeaVimTestCase import org.jetbrains.plugins.ideavim.waitUntil import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach @@ -46,7 +46,7 @@ private const val defaultValue = "defaultValue" private const val defaultNumberValue = 10 @TestWithoutNeovim(reason = SkipNeovimReason.OPTION) -class EffectiveOptionChangeListenerTest : VimNoWriteActionTestCase() { +class EffectiveOptionChangeListenerTest : IdeaVimTestCase() { private val optionName = "test" private lateinit var manager: FileEditorManagerImpl private lateinit var otherBufferWindow: Editor diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt index 64b4b228b2..d0742f356a 100644 --- a/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt +++ b/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt @@ -30,7 +30,7 @@ import com.maddyhome.idea.vim.options.StringOption import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString import org.jetbrains.plugins.ideavim.SkipNeovimReason import org.jetbrains.plugins.ideavim.TestWithoutNeovim -import org.jetbrains.plugins.ideavim.VimNoWriteActionTestCase +import org.jetbrains.plugins.ideavim.IdeaVimTestCase import org.jetbrains.plugins.ideavim.waitUntil import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach @@ -43,7 +43,7 @@ import kotlin.test.assertEquals // Tests the implementation of global, local to buffer, local to window and global-local @TestWithoutNeovim(reason = SkipNeovimReason.OPTION) -class OptionDeclaredScopeTest : VimNoWriteActionTestCase() { +class OptionDeclaredScopeTest : IdeaVimTestCase() { private val optionName = "test" private val defaultValue = VimString("defaultValue") private val setValue = VimString("setValue") diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt index 0635a2cca9..3b8fef12a0 100644 --- a/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt +++ b/src/test/java/org/jetbrains/plugins/ideavim/option/overrides/TextWidthOptionMapperTest.kt @@ -27,7 +27,7 @@ import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory import com.intellij.testFramework.replaceService import org.jetbrains.plugins.ideavim.SkipNeovimReason import org.jetbrains.plugins.ideavim.TestWithoutNeovim -import org.jetbrains.plugins.ideavim.VimNoWriteActionTestCase +import org.jetbrains.plugins.ideavim.IdeaVimTestCase import org.jetbrains.plugins.ideavim.waitUntil import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue @@ -38,7 +38,7 @@ import javax.swing.SwingConstants import kotlin.test.assertEquals @TestWithoutNeovim(reason = SkipNeovimReason.NOT_VIM_TESTING) -class TextWidthOptionMapperTest : VimNoWriteActionTestCase() { +class TextWidthOptionMapperTest : IdeaVimTestCase() { // IntelliJ can have a margin set, but not act on it. We want to maintain this, not least because the right margin // visual guide is shown by default diff --git a/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/VimTestCase.kt b/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/VimTestCase.kt index adfafe5ad5..8f0b196d8e 100644 --- a/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/VimTestCase.kt +++ b/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/VimTestCase.kt @@ -114,7 +114,7 @@ import kotlin.test.assertTrue * This is done as we have no mechanism to guarantee compatibility as we update this test case. * Feel free to copy this class into your plugin, or copy just needed functions. * - * Deprecated: Use [VimNoWriteActionTestCase] + * Deprecated: Use [IdeaVimTestCase] * Tests with [VimTestCase] are always started on the EDT with the write action. This is not only incorrect but also * prevents an implementation of VIM-3376. * @@ -135,10 +135,10 @@ import kotlin.test.assertTrue @RunInEdt(writeIntent = true) @ApiStatus.Internal @Deprecated( - "Use VimNoWriteActionTestCase instead", - replaceWith = ReplaceWith("VimNoWriteActionTestCase", "org.jetbrains.plugins.ideavim.VimNoWriteActionTestCase") + "Use IdeaVimTestCase instead", + replaceWith = ReplaceWith("IdeaVimTestCase", "org.jetbrains.plugins.ideavim.IdeaVimTestCase") ) -abstract class VimTestCase : VimNoWriteActionTestCase() { +abstract class VimTestCase : IdeaVimTestCase() { object Checks { var caretShape: Boolean = true @@ -171,7 +171,7 @@ abstract class VimTestCase : VimNoWriteActionTestCase() { } @ApiStatus.Internal -abstract class VimNoWriteActionTestCase { +abstract class IdeaVimTestCase { protected lateinit var fixture: CodeInsightTestFixture lateinit var testInfo: TestInfo diff --git a/tests/java-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/VimJavaTestCase.kt b/tests/java-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/VimJavaTestCase.kt index 9e66edfdde..932aefd9af 100644 --- a/tests/java-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/VimJavaTestCase.kt +++ b/tests/java-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/VimJavaTestCase.kt @@ -10,6 +10,6 @@ package org.jetbrains.plugins.ideavim import com.intellij.ide.highlighter.JavaFileType -abstract class VimJavaTestCase : VimNoWriteActionTestCase() { +abstract class VimJavaTestCase : IdeaVimTestCase() { protected fun configureByJavaText(content: String) = configureByText(JavaFileType.INSTANCE, content) } \ No newline at end of file diff --git a/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/IncrementDecrementCheck.kt b/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/IncrementDecrementCheck.kt index c8dbcc78fd..f2c6982024 100644 --- a/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/IncrementDecrementCheck.kt +++ b/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/IncrementDecrementCheck.kt @@ -18,7 +18,7 @@ import org.jetbrains.jetCheck.PropertyChecker import org.jetbrains.plugins.ideavim.NeovimTesting import org.jetbrains.plugins.ideavim.SkipNeovimReason import org.jetbrains.plugins.ideavim.TestWithoutNeovim -import org.jetbrains.plugins.ideavim.VimNoWriteActionTestCase +import org.jetbrains.plugins.ideavim.IdeaVimTestCase import org.jetbrains.plugins.ideavim.VimTestCase import org.junit.jupiter.api.Test import kotlin.math.absoluteValue @@ -76,7 +76,7 @@ private class IncrementDecrementActions(private val editor: Editor, val test: Vi val key = env.generateValue(generator, null) val action = injector.parser.parseKeys(key).single() env.logMessage("Use command: ${injector.parser.toKeyNotation(action)}.") - VimNoWriteActionTestCase.typeText(listOf(action), editor, editor.project) + IdeaVimTestCase.typeText(listOf(action), editor, editor.project) NeovimTesting.typeCommand(key, test.testInfo, editor) IdeEventQueue.getInstance().flushQueue() diff --git a/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/RandomActionsPropertyTest.kt b/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/RandomActionsPropertyTest.kt index 0515534591..42aa1f99f5 100644 --- a/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/RandomActionsPropertyTest.kt +++ b/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/RandomActionsPropertyTest.kt @@ -18,7 +18,7 @@ import com.maddyhome.idea.vim.newapi.vim import org.jetbrains.jetCheck.Generator import org.jetbrains.jetCheck.ImperativeCommand import org.jetbrains.jetCheck.PropertyChecker -import org.jetbrains.plugins.ideavim.VimNoWriteActionTestCase +import org.jetbrains.plugins.ideavim.IdeaVimTestCase import org.jetbrains.plugins.ideavim.propertybased.samples.javaText import org.jetbrains.plugins.ideavim.propertybased.samples.loremText import org.junit.jupiter.api.Test @@ -108,7 +108,7 @@ private class AvailableActions(private val editor: Editor) : ImperativeCommand { val usedKey = env.generateValue(keyGenerator, null) val node = trie.getTrieNode(currentKeys + usedKey) env.logMessage("Use command: ${injector.parser.toKeyNotation(currentKeys + usedKey)}. ${if (node?.data != null) "Action: ${node.data!!.actionId}" else ""}") - VimNoWriteActionTestCase.typeText(listOf(usedKey), editor, editor.project) + IdeaVimTestCase.typeText(listOf(usedKey), editor, editor.project) IdeEventQueue.getInstance().flushQueue() PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue() diff --git a/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/YankDeletePropertyTest.kt b/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/YankDeletePropertyTest.kt index ccb92678f0..913b5a8135 100644 --- a/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/YankDeletePropertyTest.kt +++ b/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/YankDeletePropertyTest.kt @@ -15,7 +15,7 @@ import com.maddyhome.idea.vim.api.injector import org.jetbrains.jetCheck.Generator import org.jetbrains.jetCheck.ImperativeCommand import org.jetbrains.jetCheck.PropertyChecker -import org.jetbrains.plugins.ideavim.VimNoWriteActionTestCase +import org.jetbrains.plugins.ideavim.IdeaVimTestCase import org.jetbrains.plugins.ideavim.propertybased.samples.loremText import org.junit.jupiter.api.Test @@ -41,7 +41,7 @@ private class YankDeleteActions(private val editor: Editor) : ImperativeCommand val key = env.generateValue(Generator.sampledFrom(keysList), null) env.logMessage("Use command: $key") - VimNoWriteActionTestCase.typeText(injector.parser.parseKeys(key), editor, editor.project) + IdeaVimTestCase.typeText(injector.parser.parseKeys(key), editor, editor.project) IdeEventQueue.getInstance().flushQueue() PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()