Problem: Tests are silently skipped.
Solution: Throw an exception for skipped tests in more places.
" Get line "lnum" as displayed on the screen.
" Trailing white space is trimmed.
-func! Screenline(lnum)
+func Screenline(lnum)
let chars = []
for c in range(1, winwidth(0))
call add(chars, nr2char(screenchar(a:lnum, c)))
call assert_fails("call test_override('redraw', 'yes')", 'E474')
endfunc
+func Test_mouse_position()
+ let save_mouse = &mouse
+ set mouse=a
+ new
+ call setline(1, ['line one', 'line two'])
+ call assert_equal([0, 1, 1, 0], getpos('.'))
+ call test_setmouse(1, 5)
+ call feedkeys("\<LeftMouse>", "xt")
+ call assert_equal([0, 1, 5, 0], getpos('.'))
+ call test_setmouse(2, 20)
+ call feedkeys("\<LeftMouse>", "xt")
+ call assert_equal([0, 2, 8, 0], getpos('.'))
+ call test_setmouse(5, 1)
+ call feedkeys("\<LeftMouse>", "xt")
+ call assert_equal([0, 2, 1, 0], getpos('.'))
+ bwipe!
+ let &mouse = save_mouse
+endfunc
+
func Test_user_is_happy()
smile
sleep 300m
" Tests for encryption.
if !has('cryptv')
- finish
+ throw 'Skipped, encryption feature missing'
endif
func Common_head_only(text)
" Test for cscope commands.
-if !has('cscope') || !executable('cscope') || !has('quickfix')
- finish
+if !has('cscope') || !has('quickfix')
+ throw 'Skipped, cscope or quickfix feature missing'
+endif
+if !executable('cscope')
+ throw 'Skipped, cscope program missing'
endif
func CscopeSetupOrClean(setup)
" Tests for digraphs
if !has("digraphs")
- finish
+ throw 'Skipped, digraphs feature missing'
endif
func Put_Dig(chars)
" test float functions
if !has('float')
- finish
+ throw 'Skipped, float feature missing'
end
func Test_abs()
source shared.vim
if !CanRunGui()
- finish
+ throw 'Skipped, cannot run GUI'
endif
source setup_gui.vim
source shared.vim
if !CanRunGui()
- finish
+ throw 'Skipped, cannot run GUI'
endif
source setup_gui.vim
" Tests for the history functions
if !has('cmdline_hist')
- finish
+ throw 'Skipped, cmdline_hist feature missing'
endif
set history=7
" tests for 'langmap'
if !has('langmap')
- finish
+ throw 'Skipped, langmap feature missing'
endif
func Test_langmap()
set encoding=latin1
scriptencoding latin1
-if !exists("+linebreak") || !has("conceal")
- finish
+if !exists("+linebreak")
+ throw 'Skipped, linebreak option missing'
+endif
+if !has("conceal")
+ throw 'Skipped, conceal feature missing'
endif
source view_util.vim
set encoding=utf-8
scriptencoding utf-8
-if !exists("+linebreak") || !has("conceal") || !has("signs")
- finish
+if !exists("+linebreak")
+ throw 'Skipped, linebreak option missing'
+endif
+if !has("conceal")
+ throw 'Skipped, conceal feature missing'
+endif
+if !has("signs")
+ throw 'Skipped, signs feature missing'
endif
source view_util.vim
" Tests for Lua.
if !has('lua')
- finish
+ throw 'Skipped, lua feature missing'
endif
func TearDown()
let s:python = PythonProg()
if s:python == ''
- " Can't run this test.
- finish
+ throw 'Skipped, python program missing'
endif
let s:script = 'test_makeencoding.py'
" Test for matchadd() and conceal feature
+
if !has('conceal')
- finish
+ throw 'Skipped, conceal feature missing'
endif
if !has('gui_running') && has('unix')
" Test for matchadd() and conceal feature using utf-8.
+
if !has('conceal')
- finish
+ throw 'Skipped, conceal feature missing'
endif
if !has('gui_running') && has('unix')
" Tests for memory usage.
-if !has('terminal') || has('gui_running') || $ASAN_OPTIONS !=# ''
+if !has('terminal')
+ throw 'Skipped, terminal feature missing'
+endif
+if has('gui_running')
+ throw 'Skipped, does not work in GUI'
+endif
+if $ASAN_OPTIONS !=# ''
" Skip tests on Travis CI ASAN build because it's difficult to estimate
" memory usage.
- finish
+ throw 'Skipped, does not work with ASAN'
endif
source shared.vim
if has('win32')
if !executable('wmic')
- finish
+ throw 'Skipped, wmic program missing'
endif
func s:memory_usage(pid) abort
let cmd = printf('wmic process where processid=%d get WorkingSetSize', a:pid)
endfunc
elseif has('unix')
if !executable('ps')
- finish
+ throw 'Skipped, ps program missing'
endif
func s:memory_usage(pid) abort
return s:pick_nr(system('ps -o rss= -p ' . a:pid))
endfunc
else
- finish
+ throw 'Skipped, not win32 or unix'
endif
" Wait for memory usage to level off.
" Test that the system menu can be loaded.
if !has('menu')
- finish
+ throw 'Skipped, menu feature missing'
endif
func Test_load_menu()
scriptencoding latin1
if !has('mksession')
- finish
+ throw 'Skipped, mksession feature missing'
endif
source shared.vim
scriptencoding utf-8
if !has('mksession')
- finish
+ throw 'Skipped, mksession feature missing'
endif
func Test_mksession_utf8()
" Test the netbeans interface.
if !has('netbeans_intg')
- finish
+ throw 'Skipped, netbeans_intg feature missing'
endif
source shared.vim
let s:python = PythonProg()
if s:python == ''
- " Can't run this test.
- finish
+ throw 'Skipped, python program missing'
endif
" Run "testfunc" after sarting the server and stop the server afterwards.
" Tests for bracketed paste and other forms of pasting.
" Bracketed paste only works with "xterm". Not in GUI or Windows console.
-if has('gui_running') || has('win32')
- finish
+if has('win32')
+ throw 'Skipped, does not work on MS-Windows'
+endif
+if has('gui_running')
+ throw 'Skipped, does not work in the GUI'
endif
set term=xterm
if !has('xterm_clipboard')
return
endif
-call ch_logfile('logfile', 'w')
let display = $DISPLAY
new
call CheckCopyPaste()
exe "xrestore " .. display
call CheckCopyPaste()
-call ch_logfile('', '')
bwipe!
endfunc
" Tests for Perl interface
if !has('perl')
- finish
+ throw 'Skipped, perl feature missing'
end
" FIXME: RunTest don't see any error when Perl abort...
" Test Vim profiler
+
if !has('profile')
- finish
+ throw 'Skipped, profile feature missing'
endif
func Test_profile_func()
" Tests for setting 'buftype' to "prompt"
if !has('channel')
- finish
+ throw 'Skipped, channel feature missing'
endif
source shared.vim
" TODO: move tests from test87.in here.
if !has('python')
- finish
+ throw 'Skipped, python feature missing'
endif
func Test_pydo()
" TODO: move tests from test88.in here.
if !has('python3')
- finish
+ throw 'Skipped, python3 feature missing'
endif
func Test_py3do()
set pyx=2
if !has('python')
- finish
+ throw 'Skipped, python feature missing'
endif
let s:py2pattern = '^2\.[0-7]\.\d\+'
set pyx=3
if !has('python3')
- finish
+ throw 'Skipped, python3 feature missing'
endif
let s:py2pattern = '^2\.[0-7]\.\d\+'
" Test for the quickfix feature.
if !has('quickfix')
- finish
+ throw 'Skipped, quickfix feature missing'
endif
set encoding=utf-8
source shared.vim
if !WorkingClipboard()
- finish
+ throw 'Skipped, no working clipboard'
endif
source shared.vim
" Tests for reltime()
-if !has('reltime') || !has('float')
- finish
+if !has('reltime')
+ throw 'Skipped, reltime feature missing'
+endif
+if !has('float')
+ throw 'Skipped, float feature missing'
endif
func Test_reltime()
" Tests for ruby interface
if !has('ruby')
- finish
+ throw 'Skipped, ruby feature missing'
end
func Test_ruby_change_buffer()
" Tests for the sha256() function.
-if !has('cryptv') || !exists('*sha256')
- finish
+if !has('cryptv')
+ throw 'Skipped, cryptv feature missing'
+endif
+if !exists('*sha256')
+ throw 'Skipped, sha256 function missing'
endif
function Test_sha256()
" Only for use on Win32 systems!
if !has('win32')
- finish
+ throw 'Skipped, not on MS-Windows'
endif
func TestIt(file, bits, expected)
" Test signal handling.
if !has('unix')
- finish
+ throw 'Skipped, not on Unix'
endif
source shared.vim
" Test for signs
if !has('signs')
- finish
+ throw 'Skipped, signs feature missing'
endif
func Test_sign()
" Test spell checking
if !has('spell')
- finish
+ throw 'Skipped, spell feature missing'
endif
func TearDown()
" Test for syntax and syntax iskeyword option
if !has("syntax")
- finish
+ throw 'Skipped, syntax feature missing'
endif
source view_util.vim
" Tests for the Tcl interface.
if !has('tcl')
- finish
+ throw 'Skipped, tcl feature missing'
end
" Helper function as there is no builtin tcleval() function similar
" Tests for decoding escape sequences sent by the terminal.
" This only works for Unix in a terminal
-if has('gui_running') || !has('unix')
- finish
+if has('gui_running')
+ throw 'Skipped, does not work in the GUI'
+endif
+if !has('unix')
+ throw 'Skipped, not on Unix'
endif
source shared.vim
" Tests for the terminal window.
if !has('terminal')
- finish
+ throw 'Skipped, terminal feature missing'
endif
source shared.vim
" freed. Since the process exists right away it's not a real leak.
if !has('terminal')
- finish
+ throw 'Skipped, terminal feature missing'
endif
source shared.vim
" Test for textobjects
if !has('textobjects')
- finish
+ throw 'Skipped, textobjects feature missing'
endif
func CpoM(line, useM, expected)
" buffer.
if !has('textprop')
- finish
+ throw 'Skipped, textprop feature missing'
endif
source screendump.vim
" Test for timers
if !has('timers')
- finish
+ throw 'Skipped, timers feature missing'
endif
source shared.vim
" Test for variable tabstops
if !has("vartabs")
- finish
+ throw 'Skipped, vartabs feature missing'
endif
source view_util.vim
" Test WinBar
if !has('menu')
- finish
+ throw 'Skipped, menu feature missing'
endif
source shared.vim
" Test for $HOME on Windows.
if !has('win32')
- finish
+ throw 'Skipped, not on MS-Windows'
endif
let s:env = {}
if empty($XXD) && executable('..\xxd\xxd.exe')
let s:xxd_cmd = '..\xxd\xxd.exe'
elseif empty($XXD) || !executable($XXD)
- finish
+ throw 'Skipped, xxd program missing'
else
let s:xxd_cmd = $XXD
endif
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1524,
/**/
1523,
/**/
projects / vim / commitdiff