VIM-4134 update tests for new module structure

1grzyb1 · claude · 1grzyb1 · commit 787f49285968 · 2026-03-05T09:10:30.000+01:00
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/scripts-ts/package-lock.json b/scripts-ts/package-lock.json
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/change/delete/JoinNotificationTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/change/delete/JoinNotificationTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -14,7 +14,7 @@ import com.intellij.notification.ActionCenter
 import com.intellij.notification.Notification
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.group.NotificationService
+import com.maddyhome.idea.vim.group.VimNotifications
 import org.jetbrains.plugins.ideavim.TestIjOptionConstants
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.junit.jupiter.api.Test
@@ -34,7 +34,7 @@ class JoinNotificationTest : VimTestCase() {
     }.last()
 
     try {
-      kotlin.test.assertEquals(NotificationService.IDEAVIM_NOTIFICATION_TITLE, notification.title)
+      kotlin.test.assertEquals(VimNotifications.IDEAVIM_NOTIFICATION_TITLE, notification.title)
       assertTrue(TestIjOptionConstants.ideajoin in notification.content)
       kotlin.test.assertEquals(3, notification.actions.size)
     } finally {
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/copy/IdeaPutNotificationsTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/copy/IdeaPutNotificationsTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -13,7 +13,7 @@ import com.intellij.notification.Notification
 import com.intellij.openapi.application.ApplicationManager
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.group.NotificationService
+import com.maddyhome.idea.vim.group.VimNotifications
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.options.OptionConstants
 import com.maddyhome.idea.vim.state.mode.SelectionType
@@ -45,7 +45,7 @@ class IdeaPutNotificationsTest : VimTestCase() {
 
     val notification = notifications().last()
     try {
-      kotlin.test.assertEquals(NotificationService.IDEAVIM_NOTIFICATION_TITLE, notification.title)
+      kotlin.test.assertEquals(VimNotifications.IDEAVIM_NOTIFICATION_TITLE, notification.title)
       kotlin.test.assertTrue(OptionConstants.clipboard_ideaput in notification.content)
       kotlin.test.assertEquals(2, notification.actions.size)
     } finally {
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/GnNextTextObjectTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/GnNextTextObjectTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -11,6 +11,7 @@
 package org.jetbrains.plugins.ideavim.action.motion.gn
 
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.Direction
 import com.maddyhome.idea.vim.state.mode.Mode
@@ -85,7 +86,7 @@ class GnNextTextObjectTest : VimTestCase() {
 
   private fun doTestWithSearch(keys: List<KeyStroke>, before: String, after: String) {
     configureByText(before)
-    VimPlugin.getSearch().setLastSearchState("test", "", Direction.FORWARDS)
+    (VimPlugin.getSearch() as VimSearchGroupBase).setLastSearchState("test", "", Direction.FORWARDS)
     typeText(keys)
     assertState(after)
     assertState(Mode.NORMAL())
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/GnPreviousTextObjectTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/GnPreviousTextObjectTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -11,6 +11,7 @@
 package org.jetbrains.plugins.ideavim.action.motion.gn
 
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.Direction
 import com.maddyhome.idea.vim.state.mode.Mode
@@ -63,7 +64,7 @@ class GnPreviousTextObjectTest : VimTestCase() {
 
   private fun doTestWithSearch(keys: List<KeyStroke>, before: String, after: String) {
     configureByText(before)
-    VimPlugin.getSearch().setLastSearchState("test", "", Direction.FORWARDS)
+    (VimPlugin.getSearch() as VimSearchGroupBase).setLastSearchState("test", "", Direction.FORWARDS)
     typeText(keys)
     assertState(after)
     assertState(Mode.NORMAL())
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/VisualSelectNextSearchTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/VisualSelectNextSearchTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -10,6 +10,7 @@ package org.jetbrains.plugins.ideavim.action.motion.gn
 import com.intellij.idea.TestFor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.action.motion.search.SearchWholeWordForwardAction
+import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.Direction
 import com.maddyhome.idea.vim.state.mode.Mode
@@ -57,7 +58,7 @@ class VisualSelectNextSearchTest : VimTestCase() {
   @Test
   fun testWithoutSpaces() {
     configureByText("test<caret>test")
-    VimPlugin.getSearch().setLastSearchState("test", "", Direction.FORWARDS)
+    (VimPlugin.getSearch() as VimSearchGroupBase).setLastSearchState("test", "", Direction.FORWARDS)
     typeText(injector.parser.parseKeys("gn"))
     assertOffset(7)
     assertSelection("test")
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/VisualSelectPreviousSearchTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/motion/gn/VisualSelectPreviousSearchTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -10,6 +10,7 @@ package org.jetbrains.plugins.ideavim.action.motion.gn
 import com.intellij.idea.TestFor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.action.motion.search.SearchWholeWordForwardAction
+import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.Direction
 import com.maddyhome.idea.vim.state.mode.Mode
@@ -54,7 +55,7 @@ class VisualSelectPreviousSearchTest : VimTestCase() {
   @Test
   fun testWithoutSpaces() {
     configureByText("tes<caret>ttest")
-    VimPlugin.getSearch().setLastSearchState("test", "", Direction.FORWARDS)
+    (VimPlugin.getSearch() as VimSearchGroupBase).setLastSearchState("test", "", Direction.FORWARDS)
     typeText(injector.parser.parseKeys("gN"))
     assertOffset(0)
     assertSelection("test")
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/motion/mark/MotionMarkActionTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/motion/mark/MotionMarkActionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -8,13 +8,13 @@
 
 package org.jetbrains.plugins.ideavim.action.motion.mark
 
+import com.intellij.ide.bookmark.BookmarkType
 import com.intellij.ide.bookmark.BookmarksManager
 import com.intellij.ide.bookmark.LineBookmark
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.testFramework.PlatformTestUtil
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.group.createLineBookmark
-import com.maddyhome.idea.vim.group.mnemonic
+import com.maddyhome.idea.vim.group.bookmark.BookmarkBackendService
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.junit.jupiter.api.Test
 
@@ -102,7 +102,15 @@ class MotionMarkActionTest : VimTestCase() {
     """.trimIndent()
     configureByText(text)
     enterCommand("set ideamarks")
-    fixture.project.createLineBookmark(fixture.editor, 2, 'A')
+    val bookmarkService = BookmarkBackendService.getInstance()
+    bookmarkService.createOrGetSystemMark(
+      'A',
+      2,
+      0,
+      fixture.file.virtualFile.path,
+      fixture.project.locationHash,
+      fixture.file.virtualFile.fileSystem.protocol
+    )
     ApplicationManager.getApplication().invokeAndWait {
       PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
     }
@@ -124,10 +132,25 @@ class MotionMarkActionTest : VimTestCase() {
     configureByText(text)
     enterCommand("set ideamarks")
 
-    val bookmark = fixture.project.createLineBookmark(fixture.editor, 2, 'A')
-
-    BookmarksManager.getInstance(fixture.project)?.remove(bookmark!!)
-    fixture.project.createLineBookmark(fixture.editor, 4, 'A')
+    val bookmarkService = BookmarkBackendService.getInstance()
+    bookmarkService.createOrGetSystemMark(
+      'A',
+      2,
+      0,
+      fixture.file.virtualFile.path,
+      fixture.project.locationHash,
+      fixture.file.virtualFile.fileSystem.protocol
+    )
+
+    bookmarkService.removeBookmark('A')
+    bookmarkService.createOrGetSystemMark(
+      'A',
+      4,
+      0,
+      fixture.file.virtualFile.path,
+      fixture.project.locationHash,
+      fixture.file.virtualFile.fileSystem.protocol
+    )
     ApplicationManager.getApplication().invokeAndWait {
       PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue()
     }
@@ -140,10 +163,13 @@ class MotionMarkActionTest : VimTestCase() {
 
   private fun checkMarks(vararg marks: Pair<Char, Int>) {
     val project = fixture.project
-    val validBookmarks = BookmarksManager.getInstance(project)!!.bookmarks.sortedBy { it.mnemonic(project) }
+    val bookmarksManager = BookmarksManager.getInstance(project)!!
+    val validBookmarks = bookmarksManager.bookmarks
+      .filter { bookmarksManager.getType(it) != BookmarkType.DEFAULT }
+      .sortedBy { bookmarksManager.getType(it)!!.mnemonic }
     kotlin.test.assertEquals(marks.size, validBookmarks.size)
     marks.sortedBy { it.first }.forEachIndexed { index, (mn, line) ->
-      kotlin.test.assertEquals(mn, validBookmarks[index].mnemonic(project))
+      kotlin.test.assertEquals(mn, bookmarksManager.getType(validBookmarks[index])!!.mnemonic)
       kotlin.test.assertEquals(line, (validBookmarks[index] as LineBookmark).line)
     }
   }
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/action/motion/search/SearchAgainPreviousActionTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/action/motion/search/SearchAgainPreviousActionTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -9,6 +9,7 @@
 package org.jetbrains.plugins.ideavim.action.motion.search
 
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.common.Direction
 import org.jetbrains.plugins.ideavim.SkipNeovimReason
 import org.jetbrains.plugins.ideavim.TestWithoutNeovim
@@ -203,7 +204,7 @@ class SearchAgainPreviousActionTest : VimTestCase() {
 
   private fun doTestWithSearch(keys: String, before: String, after: String) {
     doTest(keys, before, after) {
-      VimPlugin.getSearch().setLastSearchState("all", "", Direction.FORWARDS)
+      (VimPlugin.getSearch() as VimSearchGroupBase).setLastSearchState("all", "", Direction.FORWARDS)
     }
   }
 }
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/GlobalCommandTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/GlobalCommandTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -239,7 +239,7 @@ class GlobalCommandTest : VimTestCase() {
 
   @Test
   fun `test check history`() {
-    VimPlugin.getHistory().clear()
+    (VimPlugin.getHistory() as com.maddyhome.idea.vim.group.HistoryGroup).clear()
     val initialEntries = VimPlugin.getHistory().getEntries(VimHistory.Type.Command, 0, 0)
     doTest(
       "g/found/d",
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/extension/hints/HintEditorIntegrationTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/extension/hints/HintEditorIntegrationTest.kt
@@ -60,8 +60,9 @@ class HintEditorIntegrationTest : VimTestCase() {
         val targets = generator.generateHints(frame.rootPane, frame.rootPane.glassPane)
 
         val editorScrollTarget = targets.find { target ->
-          target.component is JScrollPane &&
-            target.component.viewport?.view?.javaClass?.simpleName == "EditorComponentImpl"
+          val comp = target.component
+          comp is JScrollPane &&
+            comp.viewport?.view?.javaClass?.simpleName == "EditorComponentImpl"
         }
         assertNotNull(editorScrollTarget, "Editor scroll pane should be found as a target")
         assertEquals(
diff --git a/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt b/src/test/java/org/jetbrains/plugins/ideavim/option/OptionDeclaredScopeTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -151,7 +151,7 @@ class OptionDeclaredScopeTest : VimTestCase() {
   private fun closeWindow(editor: Editor) {
     ApplicationManager.getApplication().invokeAndWait {
       // Just using fileEditorManager.closeFile(editor.virtualFile) can cause weird side effects, like opening a
-      // different buffer in an open editor. See FileGroup.closeFile
+      // different buffer in an open editor. See IjFileGroup.closeFile
       // But we can't just rely on the current EditorWindow. E.g., if we're trying to close a file that's not currently
       // open in the current window, or is open in a split while we want to close the *other* editor...
       val editorWindow = fileEditorManager.windows.first { window ->
@@ -451,7 +451,7 @@ class OptionDeclaredScopeTest : VimTestCase() {
     // If `UISettings.reuseNotModifiedTabs` is set, it will also try to close the current tab, which would have the
     // effect of looking like the current tab has been reused. It will only close the tab if it's not pinned and it's
     // not currently modified. It also checks to see if it (or a descendant) has the focus.
-    // We could change `FileGroup.openFile` to temporarily set `UISettings.reuseNotModifiedTabs` and to throw an error
+    // We could change `FileBackendServiceImpl.openFile` to temporarily set `UISettings.reuseNotModifiedTabs` and to throw an error
     // if the file is modified (`:edit! {file}`) should discard the current changes. We would also need to reset the
     // focus before trying to open the file (it's currently on the ex text field, even though that has been closed by
     // this point).
diff --git a/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/VimTestCase.kt b/src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/VimTestCase.kt
@@ -55,6 +55,7 @@ import com.maddyhome.idea.vim.api.GlobalOptions
 import com.maddyhome.idea.vim.api.Options
 import com.maddyhome.idea.vim.api.VimDigraphGroupBase
 import com.maddyhome.idea.vim.api.VimOptionGroup
+import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.options
@@ -132,7 +133,7 @@ abstract class VimTestCase(private val defaultEditorText: String? = null) {
     injector.vimState.reset()
     resetAllOptions()
     VimPlugin.getKey().resetKeyMappings()
-    VimPlugin.getSearch().resetState()
+    (VimPlugin.getSearch() as VimSearchGroupBase).resetState()
     if (VimPlugin.isNotEnabled()) VimPlugin.setEnabled(true)
     injector.globalOptions().ideastrictmode = true
     Checks.reset()
@@ -223,7 +224,7 @@ abstract class VimTestCase(private val defaultEditorText: String? = null) {
     VimFuncref.anonymousCounter = 0
     IdeavimErrorListener.testLogger.clear()
     VimPlugin.getRegister().resetRegisters()
-    VimPlugin.getSearch().resetState()
+    (VimPlugin.getSearch() as VimSearchGroupBase).resetState()
     injector.markService.resetAllMarks()
     injector.jumpService.resetJumps()
     injector.historyGroup.resetHistory()
diff --git a/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/VimPropertyTestBase.kt b/tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/VimPropertyTestBase.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2024 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -13,6 +13,7 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.newapi.vim
 import org.jetbrains.jetCheck.Generator
 import org.jetbrains.jetCheck.ImperativeCommand
@@ -37,7 +38,7 @@ abstract class VimPropertyTestBase : VimTestCase() {
     VimPlugin.getRegister().resetRegisters()
     editor.caretModel.runForEachCaret { it.moveToOffset(0) }
 
-    VimPlugin.getSearch().resetState()
+    (VimPlugin.getSearch() as VimSearchGroupBase).resetState()
     VimPlugin.getChange().reset()
   }
 
diff --git a/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/ReadCommand.kt b/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/ReadCommand.kt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2003-2023 The IdeaVim authors`
	`2`	`+ * Copyright 2003-2026 The IdeaVim authors`
`3`	`3`	`*`
`4`	`4`	`* Use of this source code is governed by an MIT-style`
`5`	`5`	`* license that can be found in the LICENSE.txt file or at`
`@@ -9,6 +9,7 @@`
`9`	`9`	`package org.jetbrains.plugins.ideavim.action.motion.search`
`10`	`10`
`11`	`11`	`import com.maddyhome.idea.vim.VimPlugin`
	`12`	`+import com.maddyhome.idea.vim.api.VimSearchGroupBase`
`12`	`13`	`import com.maddyhome.idea.vim.common.Direction`
`13`	`14`	`import org.jetbrains.plugins.ideavim.SkipNeovimReason`
`14`	`15`	`import org.jetbrains.plugins.ideavim.TestWithoutNeovim`
`@@ -203,7 +204,7 @@ class SearchAgainPreviousActionTest : VimTestCase() {`
`203`	`204`
`204`	`205`	`private fun doTestWithSearch(keys: String, before: String, after: String) {`
`205`	`206`	`doTest(keys, before, after) {`
`206`		`- VimPlugin.getSearch().setLastSearchState("all", "", Direction.FORWARDS)`
	`207`	`+ (VimPlugin.getSearch() as VimSearchGroupBase).setLastSearchState("all", "", Direction.FORWARDS)`
`207`	`208`	`}`
`208`	`209`	`}`
`209`	`210`	`}`