test: improve test conventions

Work on https://github.com/neovim/neovim/issues/27004.

1 files changed, 20 insertions, 20 deletions

diff --git a/test/functional/api/keymap_spec.lua b/test/functional/api/keymap_spec.lua
index 4380e76486..d6a8b592d7 100644
--- a/test/functional/api/keymap_spec.lua
+++ b/test/functional/api/keymap_spec.lua
@@ -1,17 +1,17 @@
-local helpers = require('test.functional.helpers')(after_each)
-
-local clear = helpers.clear
-local command = helpers.command
-local eq, neq = helpers.eq, helpers.neq
-local exec_lua = helpers.exec_lua
-local exec = helpers.exec
-local feed = helpers.feed
-local fn = helpers.fn
-local api = helpers.api
-local source = helpers.source
-local pcall_err = helpers.pcall_err
-
-local shallowcopy = helpers.shallowcopy
+local t = require('test.functional.testutil')(after_each)
+
+local clear = t.clear
+local command = t.command
+local eq, neq = t.eq, t.neq
+local exec_lua = t.exec_lua
+local exec = t.exec
+local feed = t.feed
+local fn = t.fn
+local api = t.api
+local source = t.source
+local pcall_err = t.pcall_err
+
+local shallowcopy = t.shallowcopy
 local sleep = vim.uv.sleep
 
 local sid_api_client = -9
@@ -1114,7 +1114,7 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     feed('asdf\n')
 
     eq(1, exec_lua [[return GlobalCount]])
-    eq('\nNo mapping found', helpers.exec_capture('nmap asdf'))
+    eq('\nNo mapping found', t.exec_capture('nmap asdf'))
   end)
 
   it('no double-free when unmapping simplifiable lua mappings', function()
@@ -1138,13 +1138,13 @@ describe('nvim_set_keymap, nvim_del_keymap', function()
     feed('<C-I>\n')
 
     eq(1, exec_lua [[return GlobalCount]])
-    eq('\nNo mapping found', helpers.exec_capture('nmap <C-I>'))
+    eq('\nNo mapping found', t.exec_capture('nmap <C-I>'))
   end)
 
   it('can set descriptions on mappings', function()
     api.nvim_set_keymap('n', 'lhs', 'rhs', { desc = 'map description' })
     eq(generate_mapargs('n', 'lhs', 'rhs', { desc = 'map description' }), get_mapargs('n', 'lhs'))
-    eq('\nn  lhs           rhs\n                 map description', helpers.exec_capture('nmap lhs'))
+    eq('\nn  lhs           rhs\n                 map description', t.exec_capture('nmap lhs'))
   end)
 
   it('can define !-mode abbreviations with lua callbacks', function()
@@ -1290,7 +1290,7 @@ describe('nvim_buf_set_keymap, nvim_buf_del_keymap', function()
 
   it('does not crash when setting mapping in a non-existing buffer #13541', function()
     pcall_err(api.nvim_buf_set_keymap, 100, '', 'lsh', 'irhs<Esc>', {})
-    helpers.assert_alive()
+    t.assert_alive()
   end)
 
   it('can make lua mappings', function()
@@ -1372,7 +1372,7 @@ describe('nvim_buf_set_keymap, nvim_buf_del_keymap', function()
     feed('asdf\n')
 
     eq(1, exec_lua [[return GlobalCount]])
-    eq('\nNo mapping found', helpers.exec_capture('nmap asdf'))
+    eq('\nNo mapping found', t.exec_capture('nmap asdf'))
   end)
 
   it('no double-free when unmapping simplifiable lua mappings', function()
@@ -1396,6 +1396,6 @@ describe('nvim_buf_set_keymap, nvim_buf_del_keymap', function()
     feed('<C-I>\n')
 
     eq(1, exec_lua [[return GlobalCount]])
-    eq('\nNo mapping found', helpers.exec_capture('nmap <C-I>'))
+    eq('\nNo mapping found', t.exec_capture('nmap <C-I>'))
   end)
 end)