1
0
forked from aniani/vim

patch 8.1.0417: several command line arguments are not tested

Problem:    Several command line arguments are not tested.
Solution:   Add tests for -m, -M, -R and -Vfile. (Dominique Pelle,
            closes #3458)
This commit is contained in:
Bram Moolenaar
2018-09-21 12:54:06 +02:00
parent b0e982bf05
commit 036b09ca78
2 changed files with 48 additions and 4 deletions

View File

@@ -194,8 +194,8 @@ func Test_o_arg()
" Open 2 windows split vertically. Expect: " Open 2 windows split vertically. Expect:
" - 2 windows " - 2 windows
" - both windows should have the same or almost the same width " - both windows should have the same or almost the same width
" - sum of both windows width (+ 1 separator) should be equal to the " - sum of both windows width (+ 1 for the separator) should be equal to
" number of columns " the number of columns
" - both windows should have the same height " - both windows should have the same height
" - window height (+ 2 for the statusline and Ex command) should be equal " - window height (+ 2 for the statusline and Ex command) should be equal
" to the number of lines " to the number of lines
@@ -269,6 +269,48 @@ func Test_V_arg()
call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline 1: \" The default vimrc file\..* verbose=15\n", out) call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\r\nline 1: \" The default vimrc file\..* verbose=15\n", out)
endfunc endfunc
" Test the -V[N]{filename} argument to set the 'verbose' option to N
" and set 'verbosefile' to filename.
func Test_V_file_arg()
if RunVim([], [], ' --clean -X -V2Xverbosefile -c "set verbose? verbosefile?" -cq')
let out = join(readfile('Xverbosefile'), "\n")
call assert_match("sourcing \"$VIMRUNTIME[\\/]defaults\.vim\"\n", out)
call assert_match("\n verbose=2\n", out)
call assert_match("\n verbosefile=Xverbosefile", out)
endif
call delete('Xverbosefile')
endfunc
" Test the -m, -M and -R arguments:
" -m resets 'write'
" -M resets 'modifiable' and 'write'
" -R sets 'readonly'
func Test_m_M_R()
let after = [
\ 'call writefile([&write, &modifiable, &readonly, &updatecount], "Xtestout")',
\ 'qall',
\ ]
if RunVim([], after, '')
let lines = readfile('Xtestout')
call assert_equal(['1', '1', '0', '200'], lines)
endif
if RunVim([], after, '-m')
let lines = readfile('Xtestout')
call assert_equal(['0', '1', '0', '200'], lines)
endif
if RunVim([], after, '-M')
let lines = readfile('Xtestout')
call assert_equal(['0', '0', '0', '200'], lines)
endif
if RunVim([], after, '-R')
let lines = readfile('Xtestout')
call assert_equal(['1', '1', '1', '10000'], lines)
endif
call delete('Xtestout')
endfunc
" Test the -A, -F and -H arguments (Arabic, Farsi and Hebrew modes). " Test the -A, -F and -H arguments (Arabic, Farsi and Hebrew modes).
func Test_A_F_H_arg() func Test_A_F_H_arg()
let after = [ let after = [

View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
417,
/**/ /**/
416, 416,
/**/ /**/