test: improve test conventions

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

44 files changed, 382 insertions, 389 deletions

diff --git a/test/functional/vimscript/api_functions_spec.lua b/test/functional/vimscript/api_functions_spec.lua
index 4985768bb0..10a98b646e 100644
--- a/test/functional/vimscript/api_functions_spec.lua
+++ b/test/functional/vimscript/api_functions_spec.lua
@@ -1,13 +1,13 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 local Screen = require('test.functional.ui.screen')
-local neq, eq, command = helpers.neq, helpers.eq, helpers.command
-local clear = helpers.clear
-local exc_exec, expect, eval = helpers.exc_exec, helpers.expect, helpers.eval
-local exec_lua = helpers.exec_lua
-local insert, pcall_err = helpers.insert, helpers.pcall_err
-local matches = helpers.matches
-local api = helpers.api
-local feed = helpers.feed
+local neq, eq, command = t.neq, t.eq, t.command
+local clear = t.clear
+local exc_exec, expect, eval = t.exc_exec, t.expect, t.eval
+local exec_lua = t.exec_lua
+local insert, pcall_err = t.insert, t.pcall_err
+local matches = t.matches
+local api = t.api
+local feed = t.feed
 
 describe('eval-API', function()
   before_each(clear)
diff --git a/test/functional/vimscript/buf_functions_spec.lua b/test/functional/vimscript/buf_functions_spec.lua
index 931fe640a9..5cecafa370 100644
--- a/test/functional/vimscript/buf_functions_spec.lua
+++ b/test/functional/vimscript/buf_functions_spec.lua
@@ -1,15 +1,15 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 
-local eq = helpers.eq
-local clear = helpers.clear
-local fn = helpers.fn
-local api = helpers.api
-local command = helpers.command
-local exc_exec = helpers.exc_exec
-local get_pathsep = helpers.get_pathsep
-local rmdir = helpers.rmdir
-local pcall_err = helpers.pcall_err
-local mkdir = helpers.mkdir
+local eq = t.eq
+local clear = t.clear
+local fn = t.fn
+local api = t.api
+local command = t.command
+local exc_exec = t.exc_exec
+local get_pathsep = t.get_pathsep
+local rmdir = t.rmdir
+local pcall_err = t.pcall_err
+local mkdir = t.mkdir
 
 local fname = 'Xtest-functional-eval-buf_functions'
 local fname2 = fname .. '.2'
diff --git a/test/functional/vimscript/changedtick_spec.lua b/test/functional/vimscript/changedtick_spec.lua
index 85928921c5..09aaea900b 100644
--- a/test/functional/vimscript/changedtick_spec.lua
+++ b/test/functional/vimscript/changedtick_spec.lua
@@ -1,15 +1,15 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 
-local eq = helpers.eq
-local eval = helpers.eval
-local feed = helpers.feed
-local clear = helpers.clear
-local fn = helpers.fn
-local api = helpers.api
-local command = helpers.command
-local exc_exec = helpers.exc_exec
-local pcall_err = helpers.pcall_err
-local exec_capture = helpers.exec_capture
+local eq = t.eq
+local eval = t.eval
+local feed = t.feed
+local clear = t.clear
+local fn = t.fn
+local api = t.api
+local command = t.command
+local exc_exec = t.exc_exec
+local pcall_err = t.pcall_err
+local exec_capture = t.exec_capture
 
 before_each(clear)
 
diff --git a/test/functional/vimscript/container_functions_spec.lua b/test/functional/vimscript/container_functions_spec.lua
index 1b34ea0165..c3acaa710f 100644
--- a/test/functional/vimscript/container_functions_spec.lua
+++ b/test/functional/vimscript/container_functions_spec.lua
@@ -1,9 +1,9 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 
-local eq = helpers.eq
-local eval = helpers.eval
-local api = helpers.api
-local clear = helpers.clear
+local eq = t.eq
+local eval = t.eval
+local api = t.api
+local clear = t.clear
 
 before_each(clear)
 
diff --git a/test/functional/vimscript/ctx_functions_spec.lua b/test/functional/vimscript/ctx_functions_spec.lua
index dc60a474f3..c82ce350b3 100644
--- a/test/functional/vimscript/ctx_functions_spec.lua
+++ b/test/functional/vimscript/ctx_functions_spec.lua
@@ -1,19 +1,19 @@
-local helpers = require('test.functional.helpers')(after_each)
-
-local call = helpers.call
-local clear = helpers.clear
-local command = helpers.command
-local eq = helpers.eq
-local eval = helpers.eval
-local feed = helpers.feed
+local t = require('test.functional.testutil')(after_each)
+
+local call = t.call
+local clear = t.clear
+local command = t.command
+local eq = t.eq
+local eval = t.eval
+local feed = t.feed
 local map = vim.tbl_map
-local api = helpers.api
-local parse_context = helpers.parse_context
-local exec_capture = helpers.exec_capture
-local source = helpers.source
+local api = t.api
+local parse_context = t.parse_context
+local exec_capture = t.exec_capture
+local source = t.source
 local trim = vim.trim
-local write_file = helpers.write_file
-local pcall_err = helpers.pcall_err
+local write_file = t.write_file
+local pcall_err = t.pcall_err
 
 describe('context functions', function()
   local fname1 = 'Xtest-functional-eval-ctx1'
diff --git a/test/functional/vimscript/environ_spec.lua b/test/functional/vimscript/environ_spec.lua
index 0763def84e..b4c7b30421 100644
--- a/test/functional/vimscript/environ_spec.lua
+++ b/test/functional/vimscript/environ_spec.lua
@@ -1,13 +1,13 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear = helpers.clear
-local eq = helpers.eq
-local environ = helpers.fn.environ
-local exists = helpers.fn.exists
-local system = helpers.fn.system
-local nvim_prog = helpers.nvim_prog
-local command = helpers.command
-local eval = helpers.eval
-local setenv = helpers.fn.setenv
+local t = require('test.functional.testutil')(after_each)
+local clear = t.clear
+local eq = t.eq
+local environ = t.fn.environ
+local exists = t.fn.exists
+local system = t.fn.system
+local nvim_prog = t.nvim_prog
+local command = t.command
+local eval = t.eval
+local setenv = t.fn.setenv
 
 describe('environment variables', function()
   it('environ() handles empty env variable', function()
diff --git a/test/functional/vimscript/errorlist_spec.lua b/test/functional/vimscript/errorlist_spec.lua
index 1e405e7e64..5fcdc65de1 100644
--- a/test/functional/vimscript/errorlist_spec.lua
+++ b/test/functional/vimscript/errorlist_spec.lua
@@ -1,13 +1,13 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 
-local clear = helpers.clear
-local command = helpers.command
-local eq = helpers.eq
-local exc_exec = helpers.exc_exec
-local get_win_var = helpers.api.nvim_win_get_var
+local clear = t.clear
+local command = t.command
+local eq = t.eq
+local exc_exec = t.exc_exec
+local get_win_var = t.api.nvim_win_get_var
 
 describe('setqflist()', function()
-  local setqflist = helpers.fn.setqflist
+  local setqflist = t.fn.setqflist
 
   before_each(clear)
 
@@ -46,7 +46,7 @@ describe('setqflist()', function()
 end)
 
 describe('setloclist()', function()
-  local setloclist = helpers.fn.setloclist
+  local setloclist = t.fn.setloclist
 
   before_each(clear)
 
@@ -73,7 +73,7 @@ describe('setloclist()', function()
   end)
 
   it("doesn't crash when when window is closed in the middle #13721", function()
-    helpers.insert([[
+    t.insert([[
     hello world]])
 
     command('vsplit')
@@ -82,6 +82,6 @@ describe('setloclist()', function()
     command('call setloclist(0, [])')
     command('lopen')
 
-    helpers.assert_alive()
+    t.assert_alive()
   end)
 end)
diff --git a/test/functional/vimscript/eval_spec.lua b/test/functional/vimscript/eval_spec.lua
index e337959810..0918c5957a 100644
--- a/test/functional/vimscript/eval_spec.lua
+++ b/test/functional/vimscript/eval_spec.lua
@@ -9,37 +9,37 @@
 --    test/functional/vimscript/<funcname>_spec.lua
 --    test/functional/vimscript/functions_spec.lua
 
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 local Screen = require('test.functional.ui.screen')
 
-local mkdir = helpers.mkdir
-local clear = helpers.clear
-local eq = helpers.eq
-local exec = helpers.exec
-local exc_exec = helpers.exc_exec
-local exec_lua = helpers.exec_lua
-local exec_capture = helpers.exec_capture
-local eval = helpers.eval
-local command = helpers.command
-local write_file = helpers.write_file
-local api = helpers.api
+local mkdir = t.mkdir
+local clear = t.clear
+local eq = t.eq
+local exec = t.exec
+local exc_exec = t.exc_exec
+local exec_lua = t.exec_lua
+local exec_capture = t.exec_capture
+local eval = t.eval
+local command = t.command
+local write_file = t.write_file
+local api = t.api
 local sleep = vim.uv.sleep
-local matches = helpers.matches
-local pcall_err = helpers.pcall_err
-local assert_alive = helpers.assert_alive
-local poke_eventloop = helpers.poke_eventloop
-local feed = helpers.feed
-local expect_exit = helpers.expect_exit
+local matches = t.matches
+local pcall_err = t.pcall_err
+local assert_alive = t.assert_alive
+local poke_eventloop = t.poke_eventloop
+local feed = t.feed
+local expect_exit = t.expect_exit
 
 describe('Up to MAX_FUNC_ARGS arguments are handled by', function()
   local max_func_args = 20 -- from eval.h
-  local range = helpers.fn.range
+  local range = t.fn.range
 
   before_each(clear)
 
   it('printf()', function()
-    local printf = helpers.fn.printf
-    local rep = helpers.fn['repeat']
+    local printf = t.fn.printf
+    local rep = t.fn['repeat']
     local expected = '2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,'
     eq(expected, printf(rep('%d,', max_func_args - 1), unpack(range(2, max_func_args))))
     local ret = exc_exec('call printf("", 2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)')
@@ -47,7 +47,7 @@ describe('Up to MAX_FUNC_ARGS arguments are handled by', function()
   end)
 
   it('rpcnotify()', function()
-    local rpcnotify = helpers.fn.rpcnotify
+    local rpcnotify = t.fn.rpcnotify
     local ret = rpcnotify(0, 'foo', unpack(range(3, max_func_args)))
     eq(1, ret)
     ret = exc_exec('call rpcnotify(0, "foo", 3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21)')
@@ -69,17 +69,17 @@ describe('backtick expansion', function()
   end)
 
   teardown(function()
-    helpers.rmdir('test-backticks')
+    t.rmdir('test-backticks')
   end)
 
   it("with default 'shell'", function()
-    if helpers.is_os('win') then
+    if t.is_os('win') then
       command(':silent args `dir /b *2`')
     else
       command(':silent args `echo ***2`')
     end
     eq({ 'file2' }, eval('argv()'))
-    if helpers.is_os('win') then
+    if t.is_os('win') then
       command(':silent args `dir /s/b *4`')
       eq({ 'subdir\\file4' }, eval('map(argv(), \'fnamemodify(v:val, ":.")\')'))
     else
diff --git a/test/functional/vimscript/executable_spec.lua b/test/functional/vimscript/executable_spec.lua
index 1d95f6088e..de16563eed 100644
--- a/test/functional/vimscript/executable_spec.lua
+++ b/test/functional/vimscript/executable_spec.lua
@@ -1,9 +1,8 @@
-local helpers = require('test.functional.helpers')(after_each)
-local eq, clear, call, write_file, command =
-  helpers.eq, helpers.clear, helpers.call, helpers.write_file, helpers.command
-local exc_exec = helpers.exc_exec
-local eval = helpers.eval
-local is_os = helpers.is_os
+local t = require('test.functional.testutil')(after_each)
+local eq, clear, call, write_file, command = t.eq, t.clear, t.call, t.write_file, t.command
+local exc_exec = t.exc_exec
+local eval = t.eval
+local is_os = t.is_os
 
 describe('executable()', function()
   before_each(clear)
diff --git a/test/functional/vimscript/execute_spec.lua b/test/functional/vimscript/execute_spec.lua
index ce66545c82..b765f50fe4 100644
--- a/test/functional/vimscript/execute_spec.lua
+++ b/test/functional/vimscript/execute_spec.lua
@@ -1,15 +1,15 @@
-local helpers = require('test.functional.helpers')(after_each)
-local eq = helpers.eq
-local eval = helpers.eval
-local clear = helpers.clear
-local source = helpers.source
-local exc_exec = helpers.exc_exec
-local pcall_err = helpers.pcall_err
-local fn = helpers.fn
+local t = require('test.functional.testutil')(after_each)
+local eq = t.eq
+local eval = t.eval
+local clear = t.clear
+local source = t.source
+local exc_exec = t.exc_exec
+local pcall_err = t.pcall_err
+local fn = t.fn
 local Screen = require('test.functional.ui.screen')
-local command = helpers.command
-local feed = helpers.feed
-local is_os = helpers.is_os
+local command = t.command
+local feed = t.feed
+local is_os = t.is_os
 
 describe('execute()', function()
   before_each(clear)
diff --git a/test/functional/vimscript/exepath_spec.lua b/test/functional/vimscript/exepath_spec.lua
index 01033a2140..57242a2483 100644
--- a/test/functional/vimscript/exepath_spec.lua
+++ b/test/functional/vimscript/exepath_spec.lua
@@ -1,11 +1,11 @@
-local helpers = require('test.functional.helpers')(after_each)
-local eq, clear, call = helpers.eq, helpers.clear, helpers.call
-local command = helpers.command
-local exc_exec = helpers.exc_exec
-local matches = helpers.matches
-local is_os = helpers.is_os
-local set_shell_powershell = helpers.set_shell_powershell
-local eval = helpers.eval
+local t = require('test.functional.testutil')(after_each)
+local eq, clear, call = t.eq, t.clear, t.call
+local command = t.command
+local exc_exec = t.exc_exec
+local matches = t.matches
+local is_os = t.is_os
+local set_shell_powershell = t.set_shell_powershell
+local eval = t.eval
 
 local find_dummies = function(ext_pat)
   local tmp_path = eval('$PATH')
diff --git a/test/functional/vimscript/fnamemodify_spec.lua b/test/functional/vimscript/fnamemodify_spec.lua
index 4a134fe23c..0706a60f57 100644
--- a/test/functional/vimscript/fnamemodify_spec.lua
+++ b/test/functional/vimscript/fnamemodify_spec.lua
@@ -1,12 +1,12 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear = helpers.clear
-local eq = helpers.eq
-local fnamemodify = helpers.fn.fnamemodify
-local getcwd = helpers.fn.getcwd
-local command = helpers.command
-local write_file = helpers.write_file
-local alter_slashes = helpers.alter_slashes
-local is_os = helpers.is_os
+local t = require('test.functional.testutil')(after_each)
+local clear = t.clear
+local eq = t.eq
+local fnamemodify = t.fn.fnamemodify
+local getcwd = t.fn.getcwd
+local command = t.command
+local write_file = t.write_file
+local alter_slashes = t.alter_slashes
+local is_os = t.is_os
 
 local function eq_slashconvert(expected, got)
   eq(alter_slashes(expected), alter_slashes(got))
@@ -24,7 +24,7 @@ describe('fnamemodify()', function()
   end)
 
   it('handles the root path', function()
-    local root = helpers.pathroot()
+    local root = t.pathroot()
     eq(root, fnamemodify([[/]], ':p:h'))
     eq(root, fnamemodify([[/]], ':p'))
     if is_os('win') then
diff --git a/test/functional/vimscript/functions_spec.lua b/test/functional/vimscript/functions_spec.lua
index 09b3334989..cb4d329ae9 100644
--- a/test/functional/vimscript/functions_spec.lua
+++ b/test/functional/vimscript/functions_spec.lua
@@ -5,12 +5,12 @@
 --
 -- Core "eval" tests live in eval_spec.lua.
 
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 
-local clear = helpers.clear
-local eval = helpers.eval
-local matches = helpers.matches
-local is_os = helpers.is_os
+local clear = t.clear
+local eval = t.eval
+local matches = t.matches
+local is_os = t.is_os
 
 before_each(clear)
 
diff --git a/test/functional/vimscript/getline_spec.lua b/test/functional/vimscript/getline_spec.lua
index 08e7711b8c..600730c010 100644
--- a/test/functional/vimscript/getline_spec.lua
+++ b/test/functional/vimscript/getline_spec.lua
@@ -1,9 +1,9 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 
-local call = helpers.call
-local clear = helpers.clear
-local eq = helpers.eq
-local expect = helpers.expect
+local call = t.call
+local clear = t.clear
+local eq = t.eq
+local expect = t.expect
 
 describe('getline()', function()
   before_each(function()
diff --git a/test/functional/vimscript/glob_spec.lua b/test/functional/vimscript/glob_spec.lua
index 77351f95fa..708b976dbb 100644
--- a/test/functional/vimscript/glob_spec.lua
+++ b/test/functional/vimscript/glob_spec.lua
@@ -1,6 +1,6 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear, command, eval, eq = helpers.clear, helpers.command, helpers.eval, helpers.eq
-local mkdir = helpers.mkdir
+local t = require('test.functional.testutil')(after_each)
+local clear, command, eval, eq = t.clear, t.command, t.eval, t.eq
+local mkdir = t.mkdir
 
 before_each(function()
   clear()
diff --git a/test/functional/vimscript/has_spec.lua b/test/functional/vimscript/has_spec.lua
index 82b3db5b67..08193f8d02 100644
--- a/test/functional/vimscript/has_spec.lua
+++ b/test/functional/vimscript/has_spec.lua
@@ -1,11 +1,11 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 local Screen = require('test.functional.ui.screen')
-local clear = helpers.clear
-local connect = helpers.connect
-local eq = helpers.eq
-local fn = helpers.fn
-local is_os = helpers.is_os
-local nvim_prog = helpers.nvim_prog
+local clear = t.clear
+local connect = t.connect
+local eq = t.eq
+local fn = t.fn
+local is_os = t.is_os
+local nvim_prog = t.nvim_prog
 
 describe('has()', function()
   before_each(clear)
diff --git a/test/functional/vimscript/hostname_spec.lua b/test/functional/vimscript/hostname_spec.lua
index 62520e8222..024997f6b0 100644
--- a/test/functional/vimscript/hostname_spec.lua
+++ b/test/functional/vimscript/hostname_spec.lua
@@ -1,9 +1,9 @@
-local helpers = require('test.functional.helpers')(after_each)
-local eq = helpers.eq
-local ok = helpers.ok
-local call = helpers.call
-local clear = helpers.clear
-local is_os = helpers.is_os
+local t = require('test.functional.testutil')(after_each)
+local eq = t.eq
+local ok = t.ok
+local call = t.call
+local clear = t.clear
+local is_os = t.is_os
 
 describe('hostname()', function()
   before_each(clear)
diff --git a/test/functional/vimscript/input_spec.lua b/test/functional/vimscript/input_spec.lua
index d64ae3b0f1..0ac22c7320 100644
--- a/test/functional/vimscript/input_spec.lua
+++ b/test/functional/vimscript/input_spec.lua
@@ -1,14 +1,14 @@
-local helpers = require('test.functional.helpers')(after_each)
+local t = require('test.functional.testutil')(after_each)
 local Screen = require('test.functional.ui.screen')
 
-local eq = helpers.eq
-local feed = helpers.feed
-local api = helpers.api
-local clear = helpers.clear
-local source = helpers.source
-local command = helpers.command
-local exc_exec = helpers.exc_exec
-local async_meths = helpers.async_meths
+local eq = t.eq
+local feed = t.feed
+local api = t.api
+local clear = t.clear
+local source = t.source
+local command = t.command
+local exc_exec = t.exc_exec
+local async_meths = t.async_meths
 local NIL = vim.NIL
 
 local screen
diff --git a/test/functional/vimscript/json_functions_spec.lua b/test/functional/vimscript/json_functions_spec.lua
index ef0359263e..e4a9c41d59 100644
--- a/test/functional/vimscript/json_functions_spec.lua
+++ b/test/functional/vimscript/json_functions_spec.lua
@@ -1,14 +1,14 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear = helpers.clear
-local fn = helpers.fn
-local api = helpers.api
-local eq = helpers.eq
-local eval = helpers.eval
-local command = helpers.command
-local exc_exec = helpers.exc_exec
-local pcall_err = helpers.pcall_err
+local t = require('test.functional.testutil')(after_each)
+local clear = t.clear
+local fn = t.fn
+local api = t.api
+local eq = t.eq
+local eval = t.eval
+local command = t.command
+local exc_exec = t.exc_exec
+local pcall_err = t.pcall_err
 local NIL = vim.NIL
-local source = helpers.source
+local source = t.source
 
 describe('json_decode() function', function()
   local restart = function(...)
diff --git a/test/functional/vimscript/lang_spec.lua b/test/functional/vimscript/lang_spec.lua
index 2dde90e334..cad3df9aef 100644
--- a/test/functional/vimscript/lang_spec.lua
+++ b/test/functional/vimscript/lang_spec.lua
@@ -1,6 +1,6 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear, eval, eq = helpers.clear, helpers.eval, helpers.eq
-local exc_exec, source = helpers.exc_exec, helpers.source
+local t = require('test.functional.testutil')(after_each)
+local clear, eval, eq = t.clear, t.eval, t.eq
+local exc_exec, source = t.exc_exec, t.source
 
 describe('vimscript', function()
   before_each(clear)
diff --git a/test/functional/vimscript/let_spec.lua b/test/functional/vimscript/let_spec.lua
index 15d4b189b8..bcfd12cbe8 100644
--- a/test/functional/vimscript/let_spec.lua
+++ b/