patch 9.1.1524: tests: too many imports in the test suite

Problem:  tests: too many imports in the test suite
Solution: Clean up the imported scripts

Most tests make use of check.vim, so let's just source it once in
runtest.vim instead of having each test manually source it.

runtest.vim already sources shared.vim, which again sources
view_util.vim, so we don't need to source those two common
dependencies in all the other tests

And then check.vim sources term_util.vim already, so we can in addition
drop sourcing it explicitly in each single test script.

Note: test_expand_func.vim had to be updated to account for the changed
number of sourced files.

And finally check.vim uses line-continuation so let's also explicitly
enable line continuation via the 'cpo' option value.

related: #17677

Signed-off-by: Christian Brabandt <cb@256bit.org>

src/testdir/check.vim

@@ -1,6 +1,10 @@
 source shared.vim
 source term_util.vim
 
+" uses line-continuation
+let s:cpo_save = &cpo
+set cpo&vim
+
 command -nargs=1 MissingFeature throw 'Skipped: ' .. <args> .. ' feature missing'
 
 " Command to check for the presence of a feature.
@@ -324,4 +328,7 @@ func CheckGithubActions()
     throw "Skipped: FIXME: this test doesn't work on Github Actions CI"
   endif
 endfunc
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
 " vim: shiftwidth=2 sts=2 expandtab

src/testdir/runtest.vim

@@ -106,6 +106,9 @@ source setup.vim
 " Needed for RunningWithValgrind().
 source shared.vim
 
+" Needed for the various Check commands
+source check.vim
+
 " For consistency run all tests with 'nocompatible' set.
 " This also enables use of line continuation.
 set nocp viminfo+=nviminfo

src/testdir/screendump.vim

@@ -5,9 +5,6 @@ if exists('*VerifyScreenDump')
   finish
 endif
 
-source shared.vim
-source term_util.vim
-
 " Skip the rest if there is no terminal feature at all.
 if !has('terminal')
   finish

src/testdir/test_arabic.vim

@@ -2,11 +2,8 @@
 " NOTE: This just checks if the code works. If you know Arabic please add
 " functional tests that check the shaping works with real text.
 
-source check.vim
 CheckFeature arabic
 
-source view_util.vim
-
 " Return list of Unicode characters at line lnum.
 " Combining characters are treated as a single item.
 func s:get_chars(lnum)

src/testdir/test_arglist.vim

@@ -1,9 +1,5 @@
 " Test argument list commands
 
-source check.vim
-source shared.vim
-source term_util.vim
-
 func Reset_arglist()
   args a | %argd
 endfunc

src/testdir/test_assert.vim

@@ -1,8 +1,5 @@
 " Test that the methods used for testing work.
 
-source check.vim
-source term_util.vim
-
 func Test_assert_false()
   call assert_equal(0, assert_false(0))
   call assert_equal(0, assert_false(v:false))

src/testdir/test_autochdir.vim

@@ -1,6 +1,5 @@
 " Test 'autochdir' behavior
 
-source check.vim
 CheckOption autochdir
 
 func Test_set_filename()

src/testdir/test_autocmd.vim

@@ -1,8 +1,5 @@
 " Tests for autocommands
 
-source shared.vim
-source check.vim
-source term_util.vim
 source screendump.vim
 import './vim9.vim' as v9
 

src/testdir/test_backup.vim

@@ -1,7 +1,5 @@
 " Tests for the backup function
 
-source check.vim
-
 func Test_backup()
   set backup backupdir=. backupskip=
   new

src/testdir/test_balloon.vim

@@ -1,7 +1,6 @@
 " Tests for 'balloonevalterm'.
 " A few tests only work in the terminal.
 
-source check.vim
 CheckNotGui
 CheckFeature balloon_eval_term
 

src/testdir/test_balloon_gui.vim

@@ -1,6 +1,5 @@
 " Tests for 'ballooneval' in the GUI.
 
-source check.vim
 CheckGui
 CheckFeature balloon_eval
 

src/testdir/test_bench_regexp.vim

@@ -1,6 +1,5 @@
 " Test for benchmarking the RE engine
 
-source check.vim
 CheckFeature reltime
 
 func Measure(file, pattern, arg)

src/testdir/test_breakindent.vim

@@ -4,10 +4,8 @@
 " while the test is run, the breakindent caching gets in its way.
 " It helps to change the tabstop setting and force a redraw (e.g. see
 " Test_breakindent08())
-source check.vim
 CheckOption breakindent
 
-source view_util.vim
 source screendump.vim
 
 func SetUp()

src/testdir/test_buffer.vim

@@ -1,7 +1,5 @@
 " Tests for Vim buffer
 
-source check.vim
-
 " Test for the :bunload command with an offset
 func Test_bunload_with_offset()
   %bwipe!

src/testdir/test_bufline.vim

@@ -1,8 +1,6 @@
 " Tests for setbufline(), getbufline(), appendbufline(), deletebufline()
 
-source shared.vim
 source screendump.vim
-source check.vim
 
 func Test_setbufline_getbufline()
   " similar to Test_set_get_bufline()

src/testdir/test_bufwintabinfo.vim

@@ -1,7 +1,5 @@
 " Tests for the getbufinfo(), getwininfo() and gettabinfo() functions
 
-source check.vim
-
 func Test_getbufwintabinfo()
   CheckFeature quickfix
 

src/testdir/test_cd.vim

@@ -1,8 +1,5 @@
 " Test for :cd and chdir()
 
-source shared.vim
-source check.vim
-
 func Test_cd_large_path()
   " This used to crash with a heap write overflow.
   call assert_fails('cd ' . repeat('x', 5000), 'E344:')

src/testdir/test_cdo.vim

@@ -1,6 +1,5 @@
 " Tests for the :cdo, :cfdo, :ldo and :lfdo commands
 
-source check.vim
 CheckFeature quickfix
 
 " Create the files used by the tests

src/testdir/test_channel.vim

@@ -1,12 +1,9 @@
 " Test for channel and job functions.
 
 " When +channel is supported then +job is too, so we don't check for that.
-source check.vim
 CheckFeature channel
 
-source shared.vim
 source screendump.vim
-source view_util.vim
 
 let s:python = PythonProg()
 if s:python == ''

src/testdir/test_clientserver.vim

@@ -1,6 +1,5 @@
 " Tests for the +clientserver feature.
 
-source check.vim
 CheckFeature job
 
 if !has('clientserver')

src/testdir/test_clipmethod.vim

@@ -1,7 +1,5 @@
 " Tests for clipmethod
 
-source check.vim
-source shared.vim
 source window_manager.vim
 
 CheckFeature clipboard_working

src/testdir/test_cmdline.vim

@@ -1,9 +1,6 @@
 " Tests for editing the command line.
 
-source check.vim
 source screendump.vim
-source view_util.vim
-source shared.vim
 import './vim9.vim' as v9
 
 func SetUp()

src/testdir/test_cmdwin.vim

@@ -1,6 +1,5 @@
 " Tests for editing the command line.
 
-source check.vim
 source screendump.vim
 
 func Test_getcmdwintype()

src/testdir/test_compiler.vim

@@ -1,8 +1,5 @@
 " Test the :compiler command
 
-source check.vim
-source shared.vim
-
 func Test_compiler()
   CheckExecutable perl
   CheckFeature quickfix

src/testdir/test_conceal.vim

@@ -1,10 +1,8 @@
 " Tests for 'conceal'.
 
-source check.vim
 CheckFeature conceal
 
 source screendump.vim
-source view_util.vim
 
 func Test_conceal_two_windows()
   CheckScreendump

src/testdir/test_cpoptions.vim

@@ -1,9 +1,5 @@
 " Test for the various 'cpoptions' (cpo) flags
 
-source check.vim
-source shared.vim
-source view_util.vim
-
 " Test for the 'a' flag in 'cpo'. Reading a file should set the alternate
 " file name.
 func Test_cpo_a()

src/testdir/test_crash.vim

@@ -1,5 +1,4 @@
 " Some tests, that used to crash Vim
-source check.vim
 source screendump.vim
 
 CheckScreendump

src/testdir/test_crypt.vim

@@ -1,7 +1,5 @@
 " Tests for encryption.
 
-source shared.vim
-source check.vim
 CheckFeature cryptv
 
 " Use the xxd command from:

src/testdir/test_cscope.vim

@@ -1,6 +1,5 @@
 " Test for cscope commands.
 
-source check.vim
 CheckFeature cscope
 CheckFeature quickfix
 CheckExecutable cscope

src/testdir/test_cursor_func.vim

@@ -1,7 +1,5 @@
 " Tests for cursor() and other functions that get/set the cursor position
 
-source check.vim
-
 func Test_wrong_arguments()
   call assert_fails('call cursor(1. 3)', 'E474:')
   call assert_fails('call cursor(test_null_list())', 'E474:')

src/testdir/test_cursorline.vim

@@ -1,6 +1,5 @@
 " Test for cursorline and cursorlineopt
 
-source check.vim
 source screendump.vim
 
 func s:screen_attr(lnum) abort

src/testdir/test_curswant.vim

@@ -1,8 +1,5 @@
 " Tests for not changing curswant
 
-source check.vim
-source term_util.vim
-
 func Test_curswant()
   new
   call append(0, ['1234567890', '12345'])

src/testdir/test_debugger.vim

@@ -1,8 +1,6 @@
 " Tests for the Vim script debug commands
 
-source shared.vim
 source screendump.vim
-source check.vim
 
 CheckRunVimInTerminal
 

src/testdir/test_delete.vim

@@ -1,7 +1,5 @@
 " Test for delete().
 
-source check.vim
-source term_util.vim
 source screendump.vim
 
 func Test_file_delete()

src/testdir/test_diffmode.vim

@@ -1,9 +1,6 @@
 " Tests for diff mode
 
-source shared.vim
 source screendump.vim
-source check.vim
-source view_util.vim
 
 func Test_diff_fold_sync()
   enew!

src/testdir/test_digraph.vim

@@ -1,8 +1,6 @@
 " Tests for digraphs
 
-source check.vim
 CheckFeature digraphs
-source term_util.vim
 
 func Put_Dig(chars)
   exe "norm! o\<c-k>".a:chars

src/testdir/test_display.vim

@@ -4,8 +4,6 @@ if !has('gui_running') && has('unix')
   set term=ansi
 endif
 
-source view_util.vim
-source check.vim
 source screendump.vim
 
 func Test_display_foldcolumn()

src/testdir/test_edit.vim

@@ -4,9 +4,7 @@ if exists("+t_kD")
   let &t_kD="[3;*~"
 endif
 
-source check.vim
 source screendump.vim
-source view_util.vim
 
 " Needs to come first until the bug in getchar() is
 " fixed: https://groups.google.com/d/msg/vim_dev/fXL9yme4H4c/bOR-U6_bAQAJ

src/testdir/test_environ.vim

@@ -2,8 +2,6 @@
 
 scriptencoding utf-8
 
-source check.vim
-
 func Test_environ()
   unlet! $TESTENV
   call assert_equal(0, has_key(environ(), 'TESTENV'))

src/testdir/test_escaped_glob.vim

@@ -1,8 +1,6 @@
 " Test whether glob()/globpath() return correct results with certain escaped
 " characters.
 
-source check.vim
-
 func SetUp()
   " consistent sorting of file names
   set nofileignorecase

src/testdir/test_eval_stuff.vim

@@ -1,6 +1,5 @@
 " Tests for various eval things.
 
-source view_util.vim
 source shared.vim
 import './vim9.vim' as v9
 

src/testdir/test_ex_mode.vim

@@ -1,8 +1,5 @@
 " Test editing line in Ex mode (see :help Q and :help gQ).
 
-source check.vim
-source shared.vim
-
 " Helper function to test editing line in Q Ex mode
 func Ex_Q(cmd)
   " Is there a simpler way to test editing Ex line?

src/testdir/test_excmd.vim

@@ -1,8 +1,5 @@
 " Tests for various Ex commands.
 
-source check.vim
-source shared.vim
-source term_util.vim
 source screendump.vim
 
 func Test_ex_delete()

src/testdir/test_execute_func.vim

@@ -1,9 +1,6 @@
 " test execute()
 
-source view_util.vim
-source check.vim
 import './vim9.vim' as v9
-source term_util.vim
 
 func NestedEval()
   let nested = execute('echo "nested\nlines"')

src/testdir/test_exit.vim

@@ -1,8 +1,5 @@
 " Tests for exiting Vim.
 
-source shared.vim
-source check.vim
-
 func Test_exiting()
   let after =<< trim [CODE]
     au QuitPre * call writefile(["QuitPre"], "Xtestout")

src/testdir/test_expand.vim

@@ -1,8 +1,5 @@
 " Test for expanding file names
 
-source shared.vim
-source check.vim
-
 func Test_with_directories()
   call mkdir('Xdir1')
   call mkdir('Xdir2')

src/testdir/test_expand_func.vim

@@ -1,7 +1,5 @@
 " Tests for expand()
 
-source shared.vim
-
 let s:sfile = expand('<sfile>')
 let s:slnum = str2nr(expand('<slnum>'))
 let s:sflnum = str2nr(expand('<sflnum>'))
@@ -20,20 +18,20 @@ endfunc
 
 " This test depends on the location in the test file, put it first.
 func Test_expand_sflnum()
-  call assert_equal(7, s:sflnum)
-  call assert_equal(24, str2nr(expand('<sflnum>')))
+  call assert_equal(5, s:sflnum)
+  call assert_equal(22, str2nr(expand('<sflnum>')))
 
   " Line-continuation
   call assert_equal(
-        \ 27,
+        \ 25,
         \ str2nr(expand('<sflnum>')))
 
   " Call in script-local function
-  call assert_equal(18, s:expand_sflnum())
+  call assert_equal(16, s:expand_sflnum())
 
   " Call in command
   command Flnum echo expand('<sflnum>')
-  call assert_equal(36, str2nr(trim(execute('Flnum'))))
+  call assert_equal(34, str2nr(trim(execute('Flnum'))))
   delcommand Flnum
 endfunc
 
@@ -86,7 +84,7 @@ func Test_expand_sfile_and_stack()
 endfunc
 
 func Test_expand_slnum()
-  call assert_equal(6, s:slnum)
+  call assert_equal(4, s:slnum)
   call assert_equal(2, str2nr(expand('<slnum>')))
 
   " Line-continuation

src/testdir/test_expr.vim

@@ -1,6 +1,5 @@
 " Tests for expressions.
 
-source check.vim
 import './vim9.vim' as v9
 
 func Test_equal()

src/testdir/test_file_size.vim

@@ -8,8 +8,6 @@
 " cksum is part of POSIX and so should be available on most Unixes.
 " If it isn't available then the test will be skipped.
 
-source check.vim
-
 func Test_File_Size()
   CheckExecutable cksum
 

src/testdir/test_filechanged.vim

@@ -1,7 +1,5 @@
 " Tests for when a file was changed outside of Vim.
 
-source check.vim
-
 func Test_FileChangedShell_reload()
   CheckUnix
 

src/testdir/test_filecopy.vim

@@ -1,8 +1,5 @@
 " Test filecopy()
 
-source check.vim
-source shared.vim
-
 func Test_copy_file_to_file()
   call writefile(['foo'], 'Xcopy1')
 

src/testdir/test_fileformat.vim

@@ -1,7 +1,5 @@
 " Test for 'fileformat'
 
-source shared.vim
-
 " Test behavior of fileformat after bwipeout of last buffer
 func Test_fileformat_after_bw()
   bwipeout

src/testdir/test_filter_cmd.vim

@@ -1,7 +1,5 @@
 " Test the :filter command modifier
 
-source check.vim
-
 func Test_filter()
   edit Xdoesnotmatch
   edit Xwillmatch

src/testdir/test_findfile.vim

@@ -1,6 +1,5 @@
 " Test findfile() and finddir()
 
-source check.vim
 import './vim9.vim' as v9
 
 let s:files = [ 'Xfinddir1/foo',

src/testdir/test_float_func.vim

@@ -1,6 +1,5 @@
 " test float functions
 
-source check.vim
 import './vim9.vim' as v9
 
 func Test_abs()

src/testdir/test_fold.vim

@@ -1,7 +1,5 @@
 " Test for folding
 
-source check.vim
-source view_util.vim
 source screendump.vim
 
 func PrepIndent(arg)

src/testdir/test_format.vim

@@ -1,6 +1,5 @@
 " Tests for expressions.
 
-source check.vim
 import './vim9.vim' as v9
 
 func Test_printf_pos_misc()

src/testdir/test_functions.vim

@@ -1,8 +1,5 @@
 " Tests for various functions.
 
-source shared.vim
-source check.vim
-source term_util.vim
 source screendump.vim
 import './vim9.vim' as v9
 

src/testdir/test_gettext.vim

@@ -1,8 +1,7 @@
-source check.vim
+" Test for gettext()
 
 CheckFeature gettext
 
-" Test for gettext()
 func Test_gettext()
   call assert_fails('call bindtextdomain("test")', 'E119:')
   call assert_fails('call bindtextdomain("vim", "test")', 'E475:')

src/testdir/test_gettext_cp1251.vim

@@ -1,4 +1,3 @@
-source check.vim
 " This fail on CI MacOS 14 because bindtextdomain() is not available there
 " (missing library?)
 CheckNotMac

src/testdir/test_gettext_make.vim

@@ -1,4 +1,3 @@
-source check.vim
 CheckNotMac
 CheckFeature gettext
 

src/testdir/test_gettext_utf8.vim

@@ -1,4 +1,3 @@
-source check.vim
 " This fail on CI MacOS 14 because bindtextdomain() is not available there
 " (missing library?)
 CheckNotMac

src/testdir/test_global.vim

@@ -1,8 +1,5 @@
 " Test for :global and :vglobal
 
-source check.vim
-source term_util.vim
-
 func Test_yank_put_clipboard()
   new
   call setline(1, ['a', 'b', 'c'])

src/testdir/test_gui.vim

@@ -1,7 +1,5 @@
 " Tests specifically for the GUI
 
-source shared.vim
-source check.vim
 CheckCanRunGui
 
 source setup_gui.vim

src/testdir/test_gui_init.vim

@@ -1,8 +1,6 @@
 " Tests specifically for the GUI features/options that need to be set up at
 " startup to take effect at runtime.
 
-source shared.vim
-source check.vim
 CheckCanRunGui
 
 source setup_gui.vim

src/testdir/test_hardcopy.vim

@@ -1,7 +1,5 @@
 " Test :hardcopy
 
-source check.vim
-
 func Test_printoptions()
   edit test_hardcopy.vim
   syn on

src/testdir/test_help.vim

@@ -1,6 +1,5 @@
 " Tests for :help
 
-source check.vim
 import './vim9.vim' as v9
 
 func Test_help_restore_snapshot()

src/testdir/test_highlight.vim

@@ -1,8 +1,6 @@
 " Tests for ":highlight" and highlighting.
 
-source view_util.vim
 source screendump.vim
-source check.vim
 source script_util.vim
 import './vim9.vim' as v9
 

src/testdir/test_history.vim

@@ -1,6 +1,5 @@
 " Tests for the history functions
 
-source check.vim
 CheckFeature cmdline_hist
 
 set history=7

src/testdir/test_hlsearch.vim

@@ -1,6 +1,5 @@
 " Test for v:hlsearch
 
-source check.vim
 source screendump.vim
 
 func Test_hlsearch()

src/testdir/test_iminsert.vim

@@ -1,7 +1,5 @@
 " Test for 'iminsert'
 
-source view_util.vim
-source check.vim
 import './vim9.vim' as v9
 
 let s:imactivatefunc_called = 0

src/testdir/test_indent.vim

@@ -1,8 +1,5 @@
 " Test for various indent options
 
-source shared.vim
-source check.vim
-
 func Test_preserveindent()
   new
   " Test for autoindent copying indent from the previous line

src/testdir/test_ins_complete.vim

@@ -1,7 +1,6 @@
 " Test for insert completion
 
 source screendump.vim
-source check.vim
 import './vim9.vim' as v9
 
 " Test for insert expansion

src/testdir/test_job_fails.vim

@@ -2,8 +2,6 @@
 " leaks under valgrind.  That is because when fork/exec fails memory is not
 " freed.  Since the process exits right away it's not a real leak.
 
-source check.vim
-
 func Test_job_start_fails()
   CheckFeature job
   let job = job_start('axdfxsdf')

src/testdir/test_lambda.vim

@@ -1,6 +1,5 @@
 " Test for lambda and closure
 
-source check.vim
 import './vim9.vim' as v9
 
 func Test_lambda_feature()

src/testdir/test_langmap.vim

@@ -1,6 +1,5 @@
 " tests for 'langmap'
 
-source check.vim
 CheckFeature langmap
 
 func Test_langmap()

src/testdir/test_listchars.vim

@@ -1,7 +1,5 @@
 " Tests for 'listchars' display with 'list' and :list
 
-source check.vim
-source view_util.vim
 source screendump.vim
 
 func Check_listchars(expected, end_lnum, end_scol = -1, leftcol = 0)

src/testdir/test_listlbr.vim

@@ -3,11 +3,9 @@
 set encoding=latin1
 scriptencoding latin1
 
-source check.vim
 CheckOption linebreak
 CheckFeature conceal
 
-source view_util.vim
 source screendump.vim
 
 function s:screen_lines(lnum, width) abort

src/testdir/test_listlbr_utf8.vim

@@ -3,12 +3,10 @@
 set encoding=utf-8
 scriptencoding utf-8
 
-source check.vim
 CheckOption linebreak
 CheckFeature conceal
 CheckFeature signs
 
-source view_util.vim
 source screendump.vim
 
 func s:screen_lines(lnum, width) abort

src/testdir/test_lua.vim

@@ -1,7 +1,5 @@
 " Tests for Lua.
 
-source check.vim
-
 " This test also works without the lua feature.
 func Test_skip_lua()
   if 0

src/testdir/test_makeencoding.vim

@@ -1,8 +1,5 @@
 " Tests for 'makeencoding'.
 
-source shared.vim
-source check.vim
-
 CheckFeature quickfix
 let s:python = PythonProg()
 if s:python == ''

src/testdir/test_map_functions.vim

@@ -1,8 +1,6 @@
 " Tests for maparg(), mapcheck(), mapset(), maplist()
 " Also test utf8 map with a 0x80 byte.
 
-source shared.vim
-
 func s:SID()
   return str2nr(matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$'))
 endfunc

src/testdir/test_mapping.vim

@@ -1,9 +1,6 @@
 " Tests for mappings and abbreviations
 
-source shared.vim
-source check.vim
 source screendump.vim
-source term_util.vim
 import './vim9.vim' as v9
 
 func Test_abbreviation()

src/testdir/test_match.vim

@@ -2,7 +2,6 @@
 " matchaddpos(), matcharg(), matchdelete(), and setmatches().
 
 source screendump.vim
-source check.vim
 
 function Test_match()
   highlight MyGroup1 term=bold ctermbg=red guibg=red

src/testdir/test_matchadd_conceal.vim

@@ -1,16 +1,11 @@
 " Test for matchadd() and conceal feature
 
-source check.vim
 CheckFeature conceal
 
 if !has('gui_running') && has('unix')
   set term=ansi
 endif
 
-source shared.vim
-source term_util.vim
-source view_util.vim
-
 func Test_simple_matchadd()
   new
 

src/testdir/test_matchadd_conceal_utf8.vim

@@ -1,6 +1,5 @@
 " Test for matchadd() and conceal feature using utf-8.
 
-source check.vim
 CheckFeature conceal
 
 if !has('gui_running') && has('unix')

src/testdir/test_matchfuzzy.vim

@@ -1,9 +1,5 @@
 " Tests for fuzzy matching
 
-source shared.vim
-source check.vim
-source term_util.vim
-
 " Test for matchfuzzy()
 func Test_matchfuzzy()
   call assert_fails('call matchfuzzy(10, "abc")', 'E686:')

src/testdir/test_memory_usage.vim

@@ -1,6 +1,5 @@
 " Tests for memory usage.
 
-source check.vim
 CheckFeature terminal
 CheckNotGui
 
@@ -8,8 +7,6 @@ CheckNotGui
 " usage.
 CheckNotAsan
 
-source shared.vim
-
 func s:pick_nr(str) abort
   return substitute(a:str, '[^0-9]', '', 'g') * 1
 endfunc

src/testdir/test_menu.vim

@@ -1,6 +1,5 @@
 " Test that the system menu can be loaded.
 
-source check.vim
 CheckFeature menu
 
 source screendump.vim

src/testdir/test_messages.vim

@@ -1,9 +1,5 @@
 " Tests for :messages, :echomsg, :echoerr
 
-source check.vim
-source shared.vim
-source term_util.vim
-source view_util.vim
 source screendump.vim
 
 func Test_messages()

src/testdir/test_method.vim

@@ -1,7 +1,5 @@
 " Tests for ->method()
 
-source check.vim
-
 func Test_list_method()
   let l = [1, 2, 3]
   call assert_equal([1, 2, 3, 4], [1, 2, 3]->add(4))

src/testdir/test_mksession.vim

@@ -3,12 +3,8 @@
 set encoding=latin1
 scriptencoding latin1
 
-source check.vim
 CheckFeature mksession
 
-source shared.vim
-source term_util.vim
-
 " Test for storing global and local argument list in a session file
 " This one must be done first.
 func Test__mksession_arglocal()

src/testdir/test_mksession_utf8.vim

@@ -3,7 +3,6 @@
 set encoding=utf-8
 scriptencoding utf-8
 
-source check.vim
 CheckFeature mksession
 
 func Test_mksession_utf8()

src/testdir/test_modeless.vim

@@ -1,11 +1,9 @@
 " Test for modeless selection
 
 " This only works for Unix in a terminal
-source check.vim
 CheckNotGui
 CheckUnix
 
-source shared.vim
 source mouse.vim
 
 " Test for modeless characterwise selection (single click)

src/testdir/test_modeline.vim

@@ -1,7 +1,5 @@
 " Tests for parsing the modeline.
 
-source check.vim
-
 func Test_modeline_invalid()
   " This was reading allocated memory in the past.
   call writefile(['vi:0', 'nothing'], 'Xmodeline', 'D')

src/testdir/test_move.vim

@@ -1,6 +1,5 @@
 " Test the ":move" command.
 
-source check.vim
 source screendump.vim
 
 func Test_move()

src/testdir/test_mswin_event.vim

@@ -1,7 +1,6 @@
 " Test MS-Windows input event handling.
 " Most of this works the same in Windows GUI as well as Windows console.
 
-source check.vim
 CheckMSWindows
 source mouse.vim
 

src/testdir/test_mzscheme.vim

@@ -1,6 +1,5 @@
 " Test for MzScheme interface and mzeval() function
 
-source check.vim
 CheckFeature mzscheme
 
 func MzRequire()

src/testdir/test_nested_function.vim

@@ -1,7 +1,5 @@
 " Tests for nested functions
 
-source check.vim
-
 func NestedFunc()
   func! Func1()
     let g:text .= 'Func1 '

src/testdir/test_netbeans.vim

@@ -1,10 +1,7 @@
 " Test the netbeans interface.
 
-source check.vim
 CheckFeature netbeans_intg
 
-source shared.vim
-
 let s:python = PythonProg()
 if s:python == ''
   throw 'Skipped: python program missing'