1
0
forked from aniani/vim

patch 8.2.0342: some code in ex_getln.c not covered by tests

Problem:    Some code in ex_getln.c not covered by tests.
Solution:   Add more tests. (Yegappan Lakshmanan, closes #5717)
This commit is contained in:
Bram Moolenaar
2020-03-01 16:53:09 +01:00
parent 41fe061753
commit 0546d7df13
5 changed files with 60 additions and 1 deletions

View File

@@ -1188,6 +1188,7 @@ endfunc
func Test_cmdline_edit() func Test_cmdline_edit()
let str = ":one two\<C-U>" let str = ":one two\<C-U>"
let str ..= "one two\<C-W>\<C-W>" let str ..= "one two\<C-W>\<C-W>"
let str ..= "one\<BS>\<C-H>\<Del>"
let str ..= "\<Left>five\<Right>" let str ..= "\<Left>five\<Right>"
let str ..= "\<Home>two " let str ..= "\<Home>two "
let str ..= "\<C-Left>one " let str ..= "\<C-Left>one "
@@ -1206,6 +1207,7 @@ func Test_cmdline_edit_rightleft()
set rightleftcmd=search set rightleftcmd=search
let str = "/one two\<C-U>" let str = "/one two\<C-U>"
let str ..= "one two\<C-W>\<C-W>" let str ..= "one two\<C-W>\<C-W>"
let str ..= "one\<BS>\<C-H>\<Del>"
let str ..= "\<Right>five\<Left>" let str ..= "\<Right>five\<Left>"
let str ..= "\<Home>two " let str ..= "\<Home>two "
let str ..= "\<C-Right>one " let str ..= "\<C-Right>one "
@@ -1233,4 +1235,37 @@ func Test_cmdline_expr()
call assert_equal("\"e \<C-\>\<C-Y>", @:) call assert_equal("\"e \<C-\>\<C-Y>", @:)
endfunc endfunc
" Test for 'imcmdline' and 'imsearch'
" This test doesn't actually test the input method functionality.
func Test_cmdline_inputmethod()
new
call setline(1, ['', 'abc', ''])
set imcmdline
call feedkeys(":\"abc\<CR>", 'xt')
call assert_equal("\"abc", @:)
call feedkeys(":\"\<C-^>abc\<C-^>\<CR>", 'xt')
call assert_equal("\"abc", @:)
call feedkeys("/abc\<CR>", 'xt')
call assert_equal([2, 1], [line('.'), col('.')])
call feedkeys("/\<C-^>abc\<C-^>\<CR>", 'xt')
call assert_equal([2, 1], [line('.'), col('.')])
set imsearch=2
call cursor(1, 1)
call feedkeys("/abc\<CR>", 'xt')
call assert_equal([2, 1], [line('.'), col('.')])
call cursor(1, 1)
call feedkeys("/\<C-^>abc\<C-^>\<CR>", 'xt')
call assert_equal([2, 1], [line('.'), col('.')])
set imdisable
call feedkeys("/\<C-^>abc\<C-^>\<CR>", 'xt')
call assert_equal([2, 1], [line('.'), col('.')])
set imdisable&
set imsearch&
set imcmdline&
%bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -49,6 +49,8 @@ func Test_ex_mode()
call assert_equal([' foo', ' foo'], Ex(" foo\<C-d>"), e) call assert_equal([' foo', ' foo'], Ex(" foo\<C-d>"), e)
call assert_equal(['foo', ' foo0'], Ex(" foo0\<C-d>"), e) call assert_equal(['foo', ' foo0'], Ex(" foo0\<C-d>"), e)
call assert_equal(['foo', ' foo^'], Ex(" foo^\<C-d>"), e) call assert_equal(['foo', ' foo^'], Ex(" foo^\<C-d>"), e)
call assert_equal(['foo', 'foo'],
\ Ex("\<BS>\<C-H>\<Del>foo"), e)
endfor endfor
set sw& set sw&
@@ -128,4 +130,13 @@ func Test_Ex_escape_enter()
call assert_equal("a\rb", l) call assert_equal("a\rb", l)
endfunc endfunc
" Test for :append! command in Ex mode
func Test_Ex_append()
new
call setline(1, "\t abc")
call feedkeys("Qappend!\npqr\nxyz\n.\nvisual\n", 'xt')
call assert_equal(["\t abc", "\t pqr", "\t xyz"], getline(1, '$'))
close!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -114,6 +114,7 @@ function Test_Search_history_window()
bwipe! bwipe!
endfunc endfunc
" Test for :history command option completion
function Test_history_completion() function Test_history_completion()
call feedkeys(":history \<C-A>\<C-B>\"\<CR>", 'tx') call feedkeys(":history \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"history / : = > ? @ all cmd debug expr input search', @:) call assert_equal('"history / : = > ? @ all cmd debug expr input search', @:)
@@ -122,8 +123,9 @@ endfunc
" Test for increasing the 'history' option value " Test for increasing the 'history' option value
func Test_history_size() func Test_history_size()
let save_histsz = &history let save_histsz = &history
call histdel(':')
set history=10 set history=10
call histadd(':', 'ls')
call histdel(':')
for i in range(1, 5) for i in range(1, 5)
call histadd(':', 'cmd' .. i) call histadd(':', 'cmd' .. i)
endfor endfor
@@ -173,6 +175,13 @@ func Test_history_search()
call assert_equal(['pat2', 'pat1', ''], g:pat) call assert_equal(['pat2', 'pat1', ''], g:pat)
cunmap <F2> cunmap <F2>
delfunc SavePat delfunc SavePat
" Recall patterns with 'history' set to 0
set history=0
let @/ = 'abc'
let cmd = 'call feedkeys("/\<Up>\<Down>\<S-Up>\<S-Down>\<CR>", "xt")'
call assert_fails(cmd, 'E486:')
set history&
endfunc endfunc
" Test for making sure the key value is not stored in history " Test for making sure the key value is not stored in history

View File

@@ -62,3 +62,5 @@ func Test_getimstatus()
set imactivatefunc= set imactivatefunc=
set imstatusfunc= set imstatusfunc=
endfunc endfunc
" vim: shiftwidth=2 sts=2 expandtab

View File

@@ -738,6 +738,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 */
/**/
342,
/**/ /**/
341, 341,
/**/ /**/