Skip to content

Commit

Permalink
patch 8.2.2656: some command line arguments and regexp errors not tested
Browse files Browse the repository at this point in the history
Problem:    Some command line arguments and regexp errors not tested.
Solution:   Add a few test cases. (Dominique Pellé, closes #8013)
  • Loading branch information
brammool committed Mar 26, 2021
1 parent 0a1a6a1 commit a2b3e7d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 9 deletions.
11 changes: 10 additions & 1 deletion src/testdir/test_regexp_latin.vim
Original file line number Diff line number Diff line change
Expand Up @@ -924,8 +924,17 @@ func Test_regexp_error()
call assert_fails("call matchlist('x x', '\\%#=1 \\ze*')", 'E888:')
call assert_fails("call matchlist('x x', '\\%#=2 \\zs*')", 'E888:')
call assert_fails("call matchlist('x x', '\\%#=2 \\ze*')", 'E888:')
call assert_fails('exe "normal /\\%#=1\\%[x\\%[x]]\<CR>"', 'E369:')
call assert_fails("call matchstr('abcd', '\\%o841\\%o142')", 'E678:')
call assert_fails("call matchstr('abcd', '\\%#=2\\%2147483647c')", 'E951:')
call assert_fails("call matchstr('abcd', '\\%#=2\\%2147483647l')", 'E951:')
call assert_fails("call matchstr('abcd', '\\%#=2\\%2147483647v')", 'E951:')
call assert_fails('exe "normal /\\%#=1\\%[x\\%[x]]\<CR>"', 'E369:')
call assert_fails('exe "normal /\\%#=2\\%2147483647l\<CR>"', 'E951:')
call assert_fails('exe "normal /\\%#=2\\%2147483647c\<CR>"', 'E951:')
call assert_fails('exe "normal /\\%#=2\\%102261126v\<CR>"', 'E951:')
call assert_fails('exe "normal /\\%#=2\\%2147483646l\<CR>"', 'E486:')
call assert_fails('exe "normal /\\%#=2\\%2147483646c\<CR>"', 'E486:')
call assert_fails('exe "normal /\\%#=2\\%102261125v\<CR>"', 'E486:')
call assert_equal('', matchstr('abcd', '\%o181\%o142'))
endfunc

Expand Down
20 changes: 12 additions & 8 deletions src/testdir/test_startup.vim
Original file line number Diff line number Diff line change
Expand Up @@ -860,10 +860,12 @@ func Test_t_arg()
\ 'Xtags')
call writefile([' first', ' second', ' third'], 'Xfile1')

if RunVim(before, after, '-t second')
call assert_equal(['Xfile1:L2C5'], readfile('Xtestout'))
call delete('Xtestout')
endif
for t_arg in ['-t second', '-tsecond']
if RunVim(before, after, '-t second')
call assert_equal(['Xfile1:L2C5'], readfile('Xtestout'), t_arg)
call delete('Xtestout')
endif
endfor

call delete('Xtags')
call delete('Xfile1')
Expand Down Expand Up @@ -1064,10 +1066,12 @@ func Test_w_arg()

" A number argument sets the 'window' option
call writefile(["iwindow \<C-R>=&window\<CR>\<Esc>:wq! Xresult\<CR>"], 'Xscriptin', 'b')
if RunVim([], [], '-s Xscriptin -w 17')
call assert_equal(["window 17"], readfile('Xresult'))
call delete('Xresult')
endif
for w_arg in ['-w 17', '-w17']
if RunVim([], [], '-s Xscriptin ' .. w_arg)
call assert_equal(["window 17"], readfile('Xresult'), w_arg)
call delete('Xresult')
endif
endfor
call delete('Xscriptin')
endfunc

Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2656,
/**/
2655,
/**/
Expand Down

0 comments on commit a2b3e7d

Please sign in to comment.