test: improve test conventions

Specifically, functions that are run in the context of the test runner
are put in module `test/testutil.lua` while the functions that are run
in the context of the test session are put in
`test/functional/testnvim.lua`.

Closes https://github.com/neovim/neovim/issues/27004.

1 files changed, 22 insertions, 21 deletions

diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua
index e98b1bdd87..a53625ab1b 100644
--- a/test/functional/core/startup_spec.lua
+++ b/test/functional/core/startup_spec.lua
@@ -1,38 +1,39 @@
-local t = require('test.functional.testutil')()
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 local Screen = require('test.functional.ui.screen')
 
-local assert_alive = t.assert_alive
+local assert_alive = n.assert_alive
 local assert_log = t.assert_log
-local clear = t.clear
-local command = t.command
+local clear = n.clear
+local command = n.command
 local ok = t.ok
 local eq = t.eq
 local matches = t.matches
-local eval = t.eval
-local exec = t.exec
-local exec_capture = t.exec_capture
-local exec_lua = t.exec_lua
-local feed = t.feed
-local fn = t.fn
+local eval = n.eval
+local exec = n.exec
+local exec_capture = n.exec_capture
+local exec_lua = n.exec_lua
+local feed = n.feed
+local fn = n.fn
 local pesc = vim.pesc
 local mkdir = t.mkdir
-local mkdir_p = t.mkdir_p
-local nvim_prog = t.nvim_prog
-local nvim_set = t.nvim_set
+local mkdir_p = n.mkdir_p
+local nvim_prog = n.nvim_prog
+local nvim_set = n.nvim_set
 local read_file = t.read_file
 local retry = t.retry
-local rmdir = t.rmdir
+local rmdir = n.rmdir
 local sleep = vim.uv.sleep
 local startswith = vim.startswith
 local write_file = t.write_file
-local api = t.api
-local alter_slashes = t.alter_slashes
+local api = n.api
+local alter_slashes = n.alter_slashes
 local is_os = t.is_os
 local dedent = t.dedent
 local tbl_map = vim.tbl_map
 local tbl_filter = vim.tbl_filter
 local endswith = vim.endswith
-local check_close = t.check_close
+local check_close = n.check_close
 
 local testlog = 'Xtest-startupspec-log'
 
@@ -994,7 +995,7 @@ describe('sysinit', function()
   local xdgdir = 'Xxdg'
   local vimdir = 'Xvim'
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
 
   before_each(function()
     rmdir(xdgdir)
@@ -1055,7 +1056,7 @@ end)
 
 describe('user config init', function()
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
   local xconfig = xhome .. pathsep .. 'Xconfig'
   local xdata = xhome .. pathsep .. 'Xdata'
   local init_lua_path = table.concat({ xconfig, 'nvim', 'init.lua' }, pathsep)
@@ -1218,7 +1219,7 @@ end)
 
 describe('runtime:', function()
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
   local xconfig = xhome .. pathsep .. 'Xconfig'
   local xdata = xhome .. pathsep .. 'Xdata'
   local xenv = { XDG_CONFIG_HOME = xconfig, XDG_DATA_HOME = xdata }
@@ -1360,7 +1361,7 @@ end)
 
 describe('user session', function()
   local xhome = 'Xhome'
-  local pathsep = t.get_pathsep()
+  local pathsep = n.get_pathsep()
   local session_file = table.concat({ xhome, 'session.lua' }, pathsep)
 
   before_each(function()