mirror of
https://github.com/chylex/IntelliJ-IdeaVim.git
synced 2025-05-07 05:34:02 +02:00
Rename VimNoWriteActionTestCase to IdeaVimTestCase
This commit is contained in:
parent
d65a219194
commit
be86dc3c78
src
test/java/org/jetbrains/plugins/ideavim/option
testFixtures/kotlin/org/jetbrains/plugins/ideavim
tests
java-tests/src/test/kotlin/org/jetbrains/plugins/ideavim
property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased
@ -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
|
||||
|
@ -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")
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
}
|
@ -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()
|
||||
|
@ -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()
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user