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, 12 insertions, 11 deletions

diff --git a/test/functional/ui/linematch_spec.lua b/test/functional/ui/linematch_spec.lua
index 475f9c524b..03eed5a49c 100644
--- a/test/functional/ui/linematch_spec.lua
+++ b/test/functional/ui/linematch_spec.lua
@@ -1,8 +1,9 @@
-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 feed = t.feed
-local clear = t.clear
+local feed = n.feed
+local clear = n.clear
 local write_file = t.write_file
 
 describe('Diff mode screen with 3 diffs open', function()
@@ -1094,10 +1095,10 @@ describe('regressions', function()
     screen = Screen.new(100, 20)
     screen:attach()
     -- line must be greater than MATCH_CHAR_MAX_LEN
-    t.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1000) .. 'hello' })
-    t.exec 'vnew'
-    t.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1010) .. 'world' })
-    t.exec 'windo diffthis'
+    n.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1000) .. 'hello' })
+    n.exec 'vnew'
+    n.api.nvim_buf_set_lines(0, 0, -1, false, { string.rep('a', 1010) .. 'world' })
+    n.exec 'windo diffthis'
   end)
 
   it('properly computes filler lines for hunks bigger than linematch limit', function()
@@ -1109,10 +1110,10 @@ describe('regressions', function()
     for i = 0, 29 do
       lines[#lines + 1] = tostring(i)
     end
-    t.api.nvim_buf_set_lines(0, 0, -1, false, lines)
-    t.exec 'vnew'
-    t.api.nvim_buf_set_lines(0, 0, -1, false, { '00', '29' })
-    t.exec 'windo diffthis'
+    n.api.nvim_buf_set_lines(0, 0, -1, false, lines)
+    n.exec 'vnew'
+    n.api.nvim_buf_set_lines(0, 0, -1, false, { '00', '29' })
+    n.exec 'windo diffthis'
     feed('<C-e>')
     screen:expect {
       grid = [[