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, 6 insertions, 4 deletions

diff --git a/test/functional/legacy/036_regexp_character_classes_spec.lua b/test/functional/legacy/036_regexp_character_classes_spec.lua
index f948abefb7..9c871e159c 100644
--- a/test/functional/legacy/036_regexp_character_classes_spec.lua
+++ b/test/functional/legacy/036_regexp_character_classes_spec.lua
@@ -1,8 +1,10 @@
 -- Test character classes in regexp using regexpengine 0, 1, 2.
 
-local t = require('test.functional.testutil')()
-local clear, command, expect = t.clear, t.command, t.expect
-local source, write_file = t.source, t.write_file
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
+
+local clear, command, expect = n.clear, n.command, n.expect
+local source, write_file = n.source, t.write_file
 
 local function sixlines(text)
   local result = ''
@@ -15,7 +17,7 @@ end
 local function diff(text, nodedent)
   local fname = t.tmpname()
   command('w! ' .. fname)
-  t.poke_eventloop()
+  n.poke_eventloop()
   local data = io.open(fname):read('*all')
   if nodedent then
     t.eq(text, data)