test: improve test conventions

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

6 files changed, 106 insertions, 106 deletions

diff --git a/test/unit/eval/decode_spec.lua b/test/unit/eval/decode_spec.lua
index 5a8374a2a6..1f36d95473 100644
--- a/test/unit/eval/decode_spec.lua
+++ b/test/unit/eval/decode_spec.lua
@@ -1,10 +1,10 @@
-local helpers = require('test.unit.helpers')(after_each)
-local itp = helpers.gen_itp(it)
+local t = require('test.unit.testutil')(after_each)
+local itp = t.gen_itp(it)
 
-local cimport = helpers.cimport
-local eq = helpers.eq
-local neq = helpers.neq
-local ffi = helpers.ffi
+local cimport = t.cimport
+local eq = t.eq
+local neq = t.neq
+local ffi = t.ffi
 
 local decode = cimport(
   './src/nvim/eval/decode.h',
diff --git a/test/unit/eval/encode_spec.lua b/test/unit/eval/encode_spec.lua
index 498346d7cc..d0eeedf4b0 100644
--- a/test/unit/eval/encode_spec.lua
+++ b/test/unit/eval/encode_spec.lua
@@ -1,16 +1,16 @@
-local helpers = require('test.unit.helpers')(after_each)
-local itp = helpers.gen_itp(it)
-local eval_helpers = require('test.unit.eval.helpers')
+local t = require('test.unit.testutil')(after_each)
+local itp = t.gen_itp(it)
+local t_eval = require('test.unit.eval.testutil')
 
-local cimport = helpers.cimport
-local to_cstr = helpers.to_cstr
-local eq = helpers.eq
+local cimport = t.cimport
+local to_cstr = t.to_cstr
+local eq = t.eq
 
-local list = eval_helpers.list
-local lst2tbl = eval_helpers.lst2tbl
-local type_key = eval_helpers.type_key
-local list_type = eval_helpers.list_type
-local null_string = eval_helpers.null_string
+local list = t_eval.list
+local lst2tbl = t_eval.lst2tbl
+local type_key = t_eval.type_key
+local list_type = t_eval.list_type
+local null_string = t_eval.null_string
 
 local encode = cimport('./src/nvim/eval/encode.h')
 
diff --git a/test/unit/eval/helpers.lua b/test/unit/eval/testutil.lua
index 6402e1f8c9..5809877341 100644
--- a/test/unit/eval/helpers.lua
+++ b/test/unit/eval/testutil.lua
@@ -1,10 +1,10 @@
-local helpers = require('test.unit.helpers')(nil)
+local t = require('test.unit.testutil')(nil)
 
-local ptr2key = helpers.ptr2key
-local cimport = helpers.cimport
-local to_cstr = helpers.to_cstr
-local ffi = helpers.ffi
-local eq = helpers.eq
+local ptr2key = t.ptr2key
+local cimport = t.cimport
+local to_cstr = t.to_cstr
+local ffi = t.ffi
+local eq = t.eq
 
 local eval = cimport(
   './src/nvim/eval.h',
@@ -142,56 +142,56 @@ local function typvalt2lua_tab_init()
     return
   end
   typvalt2lua_tab = {
-    [tonumber(eval.VAR_BOOL)] = function(t)
+    [tonumber(eval.VAR_BOOL)] = function(q)
       return ({
         [tonumber(eval.kBoolVarFalse)] = false,
         [tonumber(eval.kBoolVarTrue)] = true,
-      })[tonumber(t.vval.v_bool)]
+      })[tonumber(q.vval.v_bool)]
     end,
-    [tonumber(eval.VAR_SPECIAL)] = function(t)
+    [tonumber(eval.VAR_SPECIAL)] = function(q)
       return ({
         [tonumber(eval.kSpecialVarNull)] = nil_value,
-      })[tonumber(t.vval.v_special)]
+      })[tonumber(q.vval.v_special)]
     end,
-    [tonumber(eval.VAR_NUMBER)] = function(t)
-      return { [type_key] = int_type, value = tonumber(t.vval.v_number) }
+    [tonumber(eval.VAR_NUMBER)] = function(q)
+      return { [type_key] = int_type, value = tonumber(q.vval.v_number) }
     end,
-    [tonumber(eval.VAR_FLOAT)] = function(t)
-      return tonumber(t.vval.v_float)
+    [tonumber(eval.VAR_FLOAT)] = function(q)
+      return tonumber(q.vval.v_float)
     end,
-    [tonumber(eval.VAR_STRING)] = function(t)
-      local str = t.vval.v_string
+    [tonumber(eval.VAR_STRING)] = function(q)
+      local str = q.vval.v_string
       if str == nil then
         return null_string
       else
         return ffi.string(str)
       end
     end,
-    [tonumber(eval.VAR_LIST)] = function(t, processed)
-      return lst2tbl(t.vval.v_list, processed)
+    [tonumber(eval.VAR_LIST)] = function(q, processed)
+      return lst2tbl(q.vval.v_list, processed)
     end,
-    [tonumber(eval.VAR_DICT)] = function(t, processed)
-      return dct2tbl(t.vval.v_dict, processed)
+    [tonumber(eval.VAR_DICT)] = function(q, processed)
+      return dct2tbl(q.vval.v_dict, processed)
     end,
-    [tonumber(eval.VAR_FUNC)] = function(t, processed)
-      return { [type_key] = func_type, value = typvalt2lua_tab[eval.VAR_STRING](t, processed or {}) }
+    [tonumber(eval.VAR_FUNC)] = function(q, processed)
+      return { [type_key] = func_type, value = typvalt2lua_tab[eval.VAR_STRING](q, processed or {}) }
     end,
-    [tonumber(eval.VAR_PARTIAL)] = function(t, processed)
-      local p_key = ptr2key(t)
+    [tonumber(eval.VAR_PARTIAL)] = function(q, processed)
+      local p_key = ptr2key(q)
       if processed[p_key] then
         return processed[p_key]
       end
-      return partial2lua(t.vval.v_partial, processed)
+      return partial2lua(q.vval.v_partial, processed)
     end,
   }
 end
 
-typvalt2lua = function(t, processed)
+typvalt2lua = function(q, processed)
   typvalt2lua_tab_init()
   return (
-    (typvalt2lua_tab[tonumber(t.v_type)] or function(t_inner)
+    (typvalt2lua_tab[tonumber(q.v_type)] or function(t_inner)
       assert(false, 'Converting ' .. tonumber(t_inner.v_type) .. ' was not implemented yet')
-    end)(t, processed or {})
+    end)(q, processed or {})
   )
 end
 
@@ -419,7 +419,7 @@ local function alloc_len(len, get_ptr)
   end
 end
 
-local alloc_logging_helpers = {
+local alloc_logging_t = {
   list = function(l)
     return { func = 'calloc', args = { 1, ffi.sizeof('list_T') }, ret = void(l) }
   end,
@@ -523,7 +523,7 @@ local function tbl2callback(tbl)
   else
     assert(false)
   end
-  return ffi.gc(ffi.cast('Callback*', ret), helpers.callback_free)
+  return ffi.gc(ffi.cast('Callback*', ret), t.callback_free)
 end
 
 local function dict_watchers(d)
@@ -591,7 +591,7 @@ return {
   list_iter = list_iter,
   first_di = first_di,
 
-  alloc_logging_helpers = alloc_logging_helpers,
+  alloc_logging_t = alloc_logging_t,
 
   list_items = list_items,
   dict_items = dict_items,
diff --git a/test/unit/eval/tricks_spec.lua b/test/unit/eval/tricks_spec.lua
index ed26fd44e4..c67bfa4fac 100644
--- a/test/unit/eval/tricks_spec.lua
+++ b/test/unit/eval/tricks_spec.lua
@@ -1,12 +1,12 @@
-local helpers = require('test.unit.helpers')(after_each)
-local eval_helpers = require('test.unit.eval.helpers')
+local t = require('test.unit.testutil')(after_each)
+local t_eval = require('test.unit.eval.testutil')
 
-local itp = helpers.gen_itp(it)
+local itp = t.gen_itp(it)
 
-local cimport = helpers.cimport
-local eq = helpers.eq
+local cimport = t.cimport
+local eq = t.eq
 
-local eval0 = eval_helpers.eval0
+local eval0 = t_eval.eval0
 
 local eval = cimport('./src/nvim/eval.h', './src/nvim/eval/typval.h', './src/nvim/memory.h')
 
diff --git a/test/unit/eval/tv_clear_spec.lua b/test/unit/eval/tv_clear_spec.lua
index a34cf6082a..86ddde9d7d 100644
--- a/test/unit/eval/tv_clear_spec.lua
+++ b/test/unit/eval/tv_clear_spec.lua
@@ -1,18 +1,18 @@
-local helpers = require('test.unit.helpers')(after_each)
-local itp = helpers.gen_itp(it)
-local eval_helpers = require('test.unit.eval.helpers')
+local t = require('test.unit.testutil')(after_each)
+local itp = t.gen_itp(it)
+local t_eval = require('test.unit.eval.testutil')
 
-local alloc_log_new = helpers.alloc_log_new
-local cimport = helpers.cimport
-local ffi = helpers.ffi
-local eq = helpers.eq
+local alloc_log_new = t.alloc_log_new
+local cimport = t.cimport
+local ffi = t.ffi
+local eq = t.eq
 
-local a = eval_helpers.alloc_logging_helpers
-local type_key = eval_helpers.type_key
-local list_type = eval_helpers.list_type
-local list_items = eval_helpers.list_items
-local dict_items = eval_helpers.dict_items
-local lua2typvalt = eval_helpers.lua2typvalt
+local a = t_eval.alloc_logging_t
+local type_key = t_eval.type_key
+local list_type = t_eval.list_type
+local list_items = t_eval.list_items
+local dict_items = t_eval.dict_items
+local lua2typvalt = t_eval.lua2typvalt
 
 local lib = cimport('./src/nvim/eval/typval.h', './src/nvim/eval.h')
 
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index a775bb48b4..029a6d53a4 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -1,45 +1,45 @@
 local bit = require('bit')
-local helpers = require('test.unit.helpers')(after_each)
-local eval_helpers = require('test.unit.eval.helpers')
-
-local itp = helpers.gen_itp(it)
-
-local OK = helpers.OK
-local eq = helpers.eq
-local neq = helpers.neq
-local ffi = helpers.ffi
-local FAIL = helpers.FAIL
-local NULL = helpers.NULL
-local cimport = helpers.cimport
-local to_cstr = helpers.to_cstr
-local alloc_log_new = helpers.alloc_log_new
-local concat_tables = helpers.concat_tables
+local t = require('test.unit.testutil')(after_each)
+local t_eval = require('test.unit.eval.testutil')
+
+local itp = t.gen_itp(it)
+
+local OK = t.OK
+local eq = t.eq
+local neq = t.neq
+local ffi = t.ffi
+local FAIL = t.FAIL
+local NULL = t.NULL
+local cimport = t.cimport
+local to_cstr = t.to_cstr
+local alloc_log_new = t.alloc_log_new
+local concat_tables = t.concat_tables
 local map = vim.tbl_map
 
-local a = eval_helpers.alloc_logging_helpers
-local int = eval_helpers.int
-local list = eval_helpers.list
-local dict = eval_helpers.dict
-local eval0 = eval_helpers.eval0
-local lst2tbl = eval_helpers.lst2tbl
-local dct2tbl = eval_helpers.dct2tbl
-local typvalt = eval_helpers.typvalt
-local type_key = eval_helpers.type_key
-local li_alloc = eval_helpers.li_alloc
-local first_di = eval_helpers.first_di
-local nil_value = eval_helpers.nil_value
-local func_type = eval_helpers.func_type
-local null_list = eval_helpers.null_list
-local null_dict = eval_helpers.null_dict
-local dict_items = eval_helpers.dict_items
-local list_items = eval_helpers.list_items
-local empty_list = eval_helpers.empty_list
-local lua2typvalt = eval_helpers.lua2typvalt
-local typvalt2lua = eval_helpers.typvalt2lua
-local null_string = eval_helpers.null_string
-local callback2tbl = eval_helpers.callback2tbl
-local tbl2callback = eval_helpers.tbl2callback
-local dict_watchers = eval_helpers.dict_watchers
+local a = t_eval.alloc_logging_t
+local int = t_eval.int
+local list = t_eval.list
+local dict = t_eval.dict
+local eval0 = t_eval.eval0
+local lst2tbl = t_eval.lst2tbl
+local dct2tbl = t_eval.dct2tbl
+local typvalt = t_eval.typvalt
+local type_key = t_eval.type_key
+local li_alloc = t_eval.li_alloc
+local first_di = t_eval.first_di
+local nil_value = t_eval.nil_value
+local func_type = t_eval.func_type
+local null_list = t_eval.null_list
+local null_dict = t_eval.null_dict
+local dict_items = t_eval.dict_items
+local list_items = t_eval.list_items
+local empty_list = t_eval.empty_list
+local lua2typvalt = t_eval.lua2typvalt
+local typvalt2lua = t_eval.typvalt2lua
+local null_string = t_eval.null_string
+local callback2tbl = t_eval.callback2tbl
+local tbl2callback = t_eval.tbl2callback
+local dict_watchers = t_eval.dict_watchers
 
 local lib = cimport(
   './src/nvim/eval/typval.h',