test/old: use CheckFunction, enable more tests

Some skipped tests have custom error messages.
Use ":CheckFunction" command for standard error message
on missing function.

9 files changed, 38 insertions, 40 deletions

diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim
index 3401e791c9..5e99edf233 100644
--- a/src/nvim/testdir/test_autocmd.vim
+++ b/src/nvim/testdir/test_autocmd.vim
@@ -76,7 +76,7 @@ if has('timers')
   endfunc
 
   func Test_OptionSet_modeline()
-    throw 'skipped: Nvim does not support test_override()'
+    CheckFunction test_override
     call test_override('starting', 1)
     au! OptionSet
     augroup set_tabstop
@@ -507,7 +507,7 @@ func s:AutoCommandOptionSet(match)
 endfunc
 
 func Test_OptionSet()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !has("eval") || !exists("+autochdir")
     return
   endif
@@ -648,7 +648,7 @@ func Test_OptionSet()
 endfunc
 
 func Test_OptionSet_diffmode()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   call test_override('starting', 1)
   " 18: Changing an option when entering diff mode
   new
@@ -682,7 +682,7 @@ func Test_OptionSet_diffmode()
 endfunc
 
 func Test_OptionSet_diffmode_close()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   call test_override('starting', 1)
   " 19: Try to close the current window when entering diff mode
   " should not segfault
@@ -1285,9 +1285,9 @@ func Test_autocommand_all_events()
 endfunc
 
 " Test TextChangedI and TextChangedP
+" See test/functional/viml/completion_spec.lua'
 func Test_ChangedP()
-  " Nvim does not support test_override().
-  throw 'skipped: see test/functional/viml/completion_spec.lua'
+  CheckFunction test_override
   new
   call setline(1, ['foo', 'bar', 'foobar'])
   call test_override("char_avail", 1)
@@ -1350,7 +1350,7 @@ func SetLineOne()
 endfunc
 
 func Test_TextChangedI_with_setline()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   new
   call test_override('char_avail', 1)
   autocmd TextChangedI <buffer> call SetLineOne()
diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim
index 3ebd048f46..08586dffe1 100644
--- a/src/nvim/testdir/test_messages.vim
+++ b/src/nvim/testdir/test_messages.vim
@@ -1,5 +1,6 @@
 " Tests for :messages, :echomsg, :echoerr
 
+source check.vim
 source shared.vim
 
 func Test_messages()
@@ -77,7 +78,7 @@ func Test_echomsg()
 endfunc
 
 func Test_echoerr()
-  throw 'skipped: Nvim does not support test_ignore_error()'
+  CheckFunction test_ignore_error
   call test_ignore_error('IgNoRe')
   call assert_equal("\nIgNoRe hello", execute(':echoerr "IgNoRe hello"'))
   call assert_equal("\n12345 IgNoRe", execute(':echoerr 12345 "IgNoRe"'))
diff --git a/src/nvim/testdir/test_popup.vim b/src/nvim/testdir/test_popup.vim
index 4ee16558a0..9443958984 100644
--- a/src/nvim/testdir/test_popup.vim
+++ b/src/nvim/testdir/test_popup.vim
@@ -871,7 +871,7 @@ func Test_popup_complete_backwards_ctrl_p()
 endfunc
 
 fun! Test_complete_o_tab()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   let s:o_char_pressed = 0
 
   fun! s:act_on_text_changed()
diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim
index 704fdacdcd..da949f5940 100644
--- a/src/nvim/testdir/test_quickfix.vim
+++ b/src/nvim/testdir/test_quickfix.vim
@@ -2660,7 +2660,7 @@ endfunc
 " Test for incsearch highlighting of the :vimgrep pattern
 " This test used to cause "E315: ml_get: invalid lnum" errors.
 func Test_vimgrep_incsearch()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   enew
   set incsearch
   call test_override("char_avail", 1)
diff --git a/src/nvim/testdir/test_search.vim b/src/nvim/testdir/test_search.vim
index feca93fef2..d4d529e4b9 100644
--- a/src/nvim/testdir/test_search.vim
+++ b/src/nvim/testdir/test_search.vim
@@ -4,9 +4,9 @@ source shared.vim
 source screendump.vim
 source check.vim
 
+" See test/functional/legacy/search_spec.lua
 func Test_search_cmdline()
-  " See test/functional/legacy/search_spec.lua
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -203,9 +203,9 @@ func Test_search_cmdline()
   bw!
 endfunc
 
+" See test/functional/legacy/search_spec.lua
 func Test_search_cmdline2()
-  " See test/functional/legacy/search_spec.lua
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -352,7 +352,7 @@ func Test_searchc()
 endfunc
 
 func Cmdline3_prep()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   " need to disable char_avail,
   " so that expansion of commandline works
   call test_override("char_avail", 1)
@@ -362,14 +362,13 @@ func Cmdline3_prep()
 endfunc
 
 func Incsearch_cleanup()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   set noincsearch
   call test_override("char_avail", 0)
   bw!
 endfunc
 
 func Test_search_cmdline3()
-  throw 'skipped: Nvim does not support test_override()'
   if !exists('+incsearch')
     return
   endif
@@ -383,7 +382,6 @@ func Test_search_cmdline3()
 endfunc
 
 func Test_search_cmdline3s()
-  throw 'skipped: Nvim does not support test_override()'
   if !exists('+incsearch')
     return
   endif
@@ -410,7 +408,6 @@ func Test_search_cmdline3s()
 endfunc
 
 func Test_search_cmdline3g()
-  throw 'skipped: Nvim does not support test_override()'
   if !exists('+incsearch')
     return
   endif
@@ -434,7 +431,6 @@ func Test_search_cmdline3g()
 endfunc
 
 func Test_search_cmdline3v()
-  throw 'skipped: Nvim does not support test_override()'
   if !exists('+incsearch')
     return
   endif
@@ -451,9 +447,9 @@ func Test_search_cmdline3v()
   call Incsearch_cleanup()
 endfunc
 
+" See test/functional/legacy/search_spec.lua
 func Test_search_cmdline4()
-  " See test/functional/legacy/search_spec.lua
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -508,7 +504,7 @@ func Test_search_cmdline5()
 endfunc
 
 func Test_search_cmdline7()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   " Test that pressing <c-g> in an empty command line
   " does not move the cursor
   if !exists('+incsearch')
@@ -799,7 +795,7 @@ func Test_incsearch_vimgrep_dump()
 endfunc
 
 func Test_keep_last_search_pattern()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -821,7 +817,7 @@ func Test_keep_last_search_pattern()
 endfunc
 
 func Test_word_under_cursor_after_match()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -841,7 +837,7 @@ func Test_word_under_cursor_after_match()
 endfunc
 
 func Test_subst_word_under_cursor()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -883,7 +879,7 @@ func Test_incsearch_with_change()
 endfunc
 
 func Test_incsearch_cmdline_modifier()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -961,7 +957,7 @@ func Test_incsearch_search_dump()
 endfunc
 
 func Test_incsearch_substitute()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
@@ -983,7 +979,7 @@ func Test_incsearch_substitute()
 endfunc
 
 func Test_incsearch_substitute_long_line()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   new
   call test_override("char_avail", 1)
   set incsearch
@@ -1105,7 +1101,7 @@ func Test_one_error_msg()
 endfunc
 
 func Test_incsearch_add_char_under_cursor()
-  throw 'skipped: Nvim does not support test_override()'
+  CheckFunction test_override
   if !exists('+incsearch')
     return
   endif
diff --git a/src/nvim/testdir/test_signs.vim b/src/nvim/testdir/test_signs.vim
index 4bbd722fdb..9c3a5636ce 100644
--- a/src/nvim/testdir/test_signs.vim
+++ b/src/nvim/testdir/test_signs.vim
@@ -1,8 +1,7 @@
 " Test for signs
 
-if !has('signs')
-  finish
-endif
+source check.vim
+CheckFeature signs
 
 source screendump.vim
 
@@ -1541,7 +1540,7 @@ endfunc
 
 " Tests for memory allocation failures in sign functions
 func Test_sign_memfailures()
-  throw 'skipped: Nvim does not support test_alloc_fail()'
+  CheckFunction test_alloc_fail
   call writefile(repeat(["Sun is shining"], 30), "Xsign")
   edit Xsign
 
diff --git a/src/nvim/testdir/test_system.vim b/src/nvim/testdir/test_system.vim
index 9cf8690d57..6bbe714d19 100644
--- a/src/nvim/testdir/test_system.vim
+++ b/src/nvim/testdir/test_system.vim
@@ -93,7 +93,6 @@ function! Test_system_exmode()
 endfunc
 
 func Test_system_with_shell_quote()
-  throw 'skipped: enable after porting method patches'
   CheckMSWindows
 
   call mkdir('Xdir with spaces', 'p')
@@ -122,7 +121,8 @@ func Test_system_with_shell_quote()
         let msg = printf('shell=%s shellxquote=%s', &shell, &shellxquote)
 
         try
-          let out = 'echo 123'->system()
+          " let out = 'echo 123'->system()
+          let out = system('echo 123')
         catch
           call assert_report(printf('%s: %s', msg, v:exception))
           continue
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 13971a918d..ceaa5de92b 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -317,8 +317,8 @@ endfunc
 " Test that the garbage collector isn't triggered if a timer callback invokes
 " vgetc().
 func Test_nocatch_garbage_collect()
-  " skipped: Nvim does not support test_garbagecollect_soon(), test_override()
-  return
+  CheckFunction test_garbagecollect_soon
+  CheckFunction test_override
   " 'uptimetime. must be bigger than the timer timeout
   set ut=200
   call test_garbagecollect_soon()
diff --git a/src/nvim/testdir/test_undo.vim b/src/nvim/testdir/test_undo.vim
index 3b66071d6d..54caed3983 100644
--- a/src/nvim/testdir/test_undo.vim
+++ b/src/nvim/testdir/test_undo.vim
@@ -3,6 +3,8 @@
 " undo-able pieces.  Do that by setting 'undolevels'.
 " Also tests :earlier and :later.
 
+source check.vim
+
 func Test_undotree()
   new
 
@@ -135,7 +137,7 @@ func BackOne(expected)
 endfunc
 
 func Test_undo_del_chars()
-  throw 'skipped: Nvim does not support test_settime()'
+  CheckFunction test_settime
 
   " Setup a buffer without creating undo entries
   new
@@ -330,7 +332,7 @@ func Test_insert_expr()
 endfunc
 
 func Test_undofile_earlier()
-  throw 'skipped: Nvim does not support test_settime()'
+  CheckFunction test_settime
 
   let t0 = localtime() - 43200
   call test_settime(t0)