mirror of
https://github.com/chylex/IntelliJ-IdeaVim.git
synced 2025-05-26 03:34:09 +02:00
Fix threading for property tests
This commit is contained in:
parent
ce01318032
commit
cf49c0b76f
src/testFixtures/kotlin/org/jetbrains/plugins/ideavim
tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased
@ -1062,6 +1062,7 @@ abstract class VimTestCase {
|
||||
val keyHandler = KeyHandler.getInstance()
|
||||
val dataContext = injector.executionContextManager.getEditorExecutionContext(editor.vim)
|
||||
TestInputModel.getInstance(editor).setKeyStrokes(keys.filterNotNull())
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
injector.actionExecutor.executeCommand(
|
||||
editor.vim,
|
||||
Runnable {
|
||||
@ -1076,6 +1077,7 @@ abstract class VimTestCase {
|
||||
null,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
fun commandToKeys(command: String): List<KeyStroke> {
|
||||
|
@ -9,6 +9,7 @@
|
||||
package org.jetbrains.plugins.ideavim.propertybased
|
||||
|
||||
import com.intellij.ide.IdeEventQueue
|
||||
import com.intellij.openapi.application.ApplicationManager
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.intellij.testFramework.PlatformTestUtil
|
||||
import com.maddyhome.idea.vim.KeyHandler
|
||||
@ -36,48 +37,60 @@ class RandomActionsPropertyTest : VimPropertyTestBase() {
|
||||
PropertyChecker.checkScenarios {
|
||||
ImperativeCommand { env ->
|
||||
val editor = configureByText(text)
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
KeyHandler.getInstance().fullReset(editor.vim)
|
||||
}
|
||||
try {
|
||||
moveCaretToRandomPlace(env, editor)
|
||||
env.executeCommands(Generator.sampledFrom(AvailableActions(editor)))
|
||||
} finally {
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
reset(editor)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testRandomActionsOnLoremIpsum() {
|
||||
PropertyChecker.checkScenarios {
|
||||
ImperativeCommand { env ->
|
||||
val editor = configureByText(loremText)
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
KeyHandler.getInstance().fullReset(editor.vim)
|
||||
}
|
||||
try {
|
||||
moveCaretToRandomPlace(env, editor)
|
||||
env.executeCommands(Generator.sampledFrom(AvailableActions(editor)))
|
||||
} finally {
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
reset(editor)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testRandomActionsOnJavaCode() {
|
||||
PropertyChecker.checkScenarios {
|
||||
ImperativeCommand { env ->
|
||||
val editor = configureByJavaText(javaText)
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
KeyHandler.getInstance().fullReset(editor.vim)
|
||||
}
|
||||
try {
|
||||
moveCaretToRandomPlace(env, editor)
|
||||
env.executeCommands(Generator.sampledFrom(AvailableActions(editor)))
|
||||
} finally {
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
reset(editor)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
private val text = """
|
||||
@ -110,9 +123,11 @@ private class AvailableActions(private val editor: Editor) : ImperativeCommand {
|
||||
env.logMessage("Use command: ${injector.parser.toKeyNotation(currentKeys + usedKey)}. ${if (node?.data != null) "Action: ${node.data!!.actionId}" else ""}")
|
||||
VimTestCase.typeText(listOf(usedKey), editor, editor.project)
|
||||
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
IdeEventQueue.getInstance().flushQueue()
|
||||
PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
|
||||
}
|
||||
}
|
||||
|
||||
private val esc = key("<Esc>")
|
||||
}
|
||||
|
@ -9,6 +9,7 @@
|
||||
package org.jetbrains.plugins.ideavim.propertybased
|
||||
|
||||
import com.intellij.ide.highlighter.JavaFileType
|
||||
import com.intellij.openapi.application.ApplicationManager
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.maddyhome.idea.vim.KeyHandler
|
||||
import com.maddyhome.idea.vim.VimPlugin
|
||||
@ -20,8 +21,12 @@ import org.jetbrains.plugins.ideavim.VimTestCase
|
||||
abstract class VimPropertyTestBase : VimTestCase() {
|
||||
protected fun moveCaretToRandomPlace(env: ImperativeCommand.Environment, editor: Editor) {
|
||||
val pos = env.generateValue(Generator.integers(0, editor.document.textLength - 1), "Put caret at position %s")
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
ApplicationManager.getApplication().runReadAction {
|
||||
editor.caretModel.currentCaret.vim.moveToOffset(pos)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected fun reset(editor: Editor) {
|
||||
val keyState = KeyHandler.getInstance().keyHandlerState
|
||||
|
@ -9,6 +9,7 @@
|
||||
package org.jetbrains.plugins.ideavim.propertybased
|
||||
|
||||
import com.intellij.ide.IdeEventQueue
|
||||
import com.intellij.openapi.application.ApplicationManager
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import com.intellij.testFramework.PlatformTestUtil
|
||||
import com.maddyhome.idea.vim.api.injector
|
||||
@ -29,12 +30,14 @@ class YankDeletePropertyTest : VimPropertyTestBase() {
|
||||
moveCaretToRandomPlace(env, editor)
|
||||
env.executeCommands(Generator.sampledFrom(YankDeleteActions(editor)))
|
||||
} finally {
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
reset(editor)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class YankDeleteActions(private val editor: Editor) : ImperativeCommand {
|
||||
override fun performCommand(env: ImperativeCommand.Environment) {
|
||||
@ -43,10 +46,12 @@ private class YankDeleteActions(private val editor: Editor) : ImperativeCommand
|
||||
env.logMessage("Use command: $key")
|
||||
VimTestCase.typeText(injector.parser.parseKeys(key), editor, editor.project)
|
||||
|
||||
ApplicationManager.getApplication().invokeAndWait {
|
||||
IdeEventQueue.getInstance().flushQueue()
|
||||
PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private val keysList =
|
||||
arrayListOf("v", "V", "<C-V>", "h", "j", "k", "l", "w", "e", "b", "y", "Y", "_", "d", "D", "c", "C", "p", "P")
|
||||
|
Loading…
Reference in New Issue
Block a user