mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:7.4.2163
Problem: match() and related functions tested with old style test.
Solution: Convert to new style test. (Hirohito Higashi)
d76a0c15f8
This commit is contained in:
Michael Ennen
parent
6fea2dfd26
commit
629e788b36
@ -37,13 +37,14 @@ NEW_TESTS = \
|
||||
test_help_tagjump.res \
|
||||
test_history.res \
|
||||
test_langmap.res \
|
||||
test_match.res \
|
||||
test_matchadd_conceal.res \
|
||||
test_syntax.res \
|
||||
test_usercommands.res \
|
||||
test_timers.res \
|
||||
test_viml.res \
|
||||
test_visual.res \
|
||||
test_window_id.res \
|
||||
test_matchadd_conceal.res \
|
||||
test_alot.res
|
||||
|
||||
SCRIPTS_GUI := test16.out
|
||||
|
||||
@ -9,7 +9,8 @@ source test_expr.vim
|
||||
source test_expr_utf8.vim
|
||||
source test_feedkeys.vim
|
||||
source test_goto.vim
|
||||
source test_matchstrpos.vim
|
||||
source test_match.vim
|
||||
source test_matchadd_conceal_utf8.vim
|
||||
source test_menu.vim
|
||||
source test_messages.vim
|
||||
source test_options.vim
|
||||
@ -20,4 +21,3 @@ source test_syn_attr.vim
|
||||
source test_tabline.vim
|
||||
source test_tabpage.vim
|
||||
source test_unlet.vim
|
||||
source test_matchadd_conceal_utf8.vim
|
||||
|
||||
165
src/nvim/testdir/test_match.vim
Normal file
165
src/nvim/testdir/test_match.vim
Normal file
@ -0,0 +1,165 @@
|
||||
" Test for :match, :2match, :3match, clearmatches(), getmatches(), matchadd(),
|
||||
" matchaddpos(), matcharg(), matchdelete(), matchstrpos() and setmatches().
|
||||
|
||||
function Test_matcharg()
|
||||
highlight MyGroup1 term=bold ctermbg=red guibg=red
|
||||
highlight MyGroup2 term=italic ctermbg=green guibg=green
|
||||
highlight MyGroup3 term=underline ctermbg=blue guibg=blue
|
||||
|
||||
" --- Check that "matcharg()" returns the correct group and pattern if a match
|
||||
" --- is defined.
|
||||
match MyGroup1 /TODO/
|
||||
2match MyGroup2 /FIXME/
|
||||
3match MyGroup3 /XXX/
|
||||
call assert_equal(['MyGroup1', 'TODO'], matcharg(1))
|
||||
call assert_equal(['MyGroup2', 'FIXME'], matcharg(2))
|
||||
call assert_equal(['MyGroup3', 'XXX'], matcharg(3))
|
||||
|
||||
" --- Check that "matcharg()" returns an empty list if the argument is not 1,
|
||||
" --- 2 or 3 (only 0 and 4 are tested).
|
||||
call assert_equal([], matcharg(0))
|
||||
call assert_equal([], matcharg(4))
|
||||
|
||||
" --- Check that "matcharg()" returns ['', ''] if a match is not defined.
|
||||
match
|
||||
2match
|
||||
3match
|
||||
call assert_equal(['', ''], matcharg(1))
|
||||
call assert_equal(['', ''], matcharg(2))
|
||||
call assert_equal(['', ''], matcharg(3))
|
||||
|
||||
" --- Check that "matchadd()" and "getmatches()" agree on added matches and
|
||||
" --- that default values apply.
|
||||
let m1 = matchadd("MyGroup1", "TODO")
|
||||
let m2 = matchadd("MyGroup2", "FIXME", 42)
|
||||
let m3 = matchadd("MyGroup3", "XXX", 60, 17)
|
||||
let ans = [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 4},
|
||||
\ {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 42, 'id': 5},
|
||||
\ {'group': 'MyGroup3', 'pattern': 'XXX', 'priority': 60, 'id': 17}]
|
||||
call assert_equal(ans, getmatches())
|
||||
|
||||
" --- Check that "matchdelete()" deletes the matches defined in the previous
|
||||
" --- test correctly.
|
||||
call matchdelete(m1)
|
||||
call matchdelete(m2)
|
||||
call matchdelete(m3)
|
||||
call assert_equal([], getmatches())
|
||||
|
||||
" --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
|
||||
let m = matchadd("MyGroup1", "TODO")
|
||||
call assert_equal(0, matchdelete(m))
|
||||
call assert_fails('call matchdelete(42)', 'E803:')
|
||||
|
||||
" --- Check that "clearmatches()" clears all matches defined by ":match" and
|
||||
" --- "matchadd()".
|
||||
let m1 = matchadd("MyGroup1", "TODO")
|
||||
let m2 = matchadd("MyGroup2", "FIXME", 42)
|
||||
let m3 = matchadd("MyGroup3", "XXX", 60, 17)
|
||||
match MyGroup1 /COFFEE/
|
||||
2match MyGroup2 /HUMPPA/
|
||||
3match MyGroup3 /VIM/
|
||||
call clearmatches()
|
||||
call assert_equal([], getmatches())
|
||||
|
||||
" --- Check that "setmatches()" restores a list of matches saved by
|
||||
" --- "getmatches()" without changes. (Matches with equal priority must also
|
||||
" --- remain in the same order.)
|
||||
let m1 = matchadd("MyGroup1", "TODO")
|
||||
let m2 = matchadd("MyGroup2", "FIXME", 42)
|
||||
let m3 = matchadd("MyGroup3", "XXX", 60, 17)
|
||||
match MyGroup1 /COFFEE/
|
||||
2match MyGroup2 /HUMPPA/
|
||||
3match MyGroup3 /VIM/
|
||||
let ml = getmatches()
|
||||
call clearmatches()
|
||||
call setmatches(ml)
|
||||
call assert_equal(ml, getmatches())
|
||||
call clearmatches()
|
||||
|
||||
" --- Check that "setmatches()" will not add two matches with the same ID. The
|
||||
" --- expected behaviour (for now) is to add the first match but not the
|
||||
" --- second and to return 0 (even though it is a matter of debate whether
|
||||
" --- this can be considered successful behaviour).
|
||||
let data = [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1},
|
||||
\ {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}]
|
||||
call assert_fails('call setmatches(data)', 'E801:')
|
||||
call assert_equal([data[0]], getmatches())
|
||||
call clearmatches()
|
||||
|
||||
" --- Check that "setmatches()" returns 0 if successful and otherwise -1.
|
||||
" --- (A range of valid and invalid input values are tried out to generate the
|
||||
" --- return values.)
|
||||
call assert_equal(0, setmatches([]))
|
||||
call assert_equal(0, setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}]))
|
||||
call clearmatches()
|
||||
call assert_fails('call setmatches(0)', 'E714:')
|
||||
call assert_fails('call setmatches([0])', 'E474:')
|
||||
call assert_fails("call setmatches([{'wrong key': 'wrong value'}])", 'E474:')
|
||||
|
||||
call setline(1, 'abcdefghijklmnopq')
|
||||
call matchaddpos("MyGroup1", [[1, 5], [1, 8, 3]], 10, 3)
|
||||
1
|
||||
redraw!
|
||||
let v1 = screenattr(1, 1)
|
||||
let v5 = screenattr(1, 5)
|
||||
let v6 = screenattr(1, 6)
|
||||
let v8 = screenattr(1, 8)
|
||||
let v10 = screenattr(1, 10)
|
||||
let v11 = screenattr(1, 11)
|
||||
call assert_notequal(v1, v5)
|
||||
call assert_equal(v6, v1)
|
||||
call assert_equal(v8, v5)
|
||||
call assert_equal(v10, v5)
|
||||
call assert_equal(v11, v1)
|
||||
call assert_equal([{'group': 'MyGroup1', 'id': 3, 'priority': 10, 'pos1': [1, 5, 1], 'pos2': [1, 8, 3]}], getmatches())
|
||||
call clearmatches()
|
||||
|
||||
"
|
||||
if has('multi_byte')
|
||||
call setline(1, 'abcdΣabcdef')
|
||||
call matchaddpos("MyGroup1", [[1, 4, 2], [1, 9, 2]])
|
||||
1
|
||||
redraw!
|
||||
let v1 = screenattr(1, 1)
|
||||
let v4 = screenattr(1, 4)
|
||||
let v5 = screenattr(1, 5)
|
||||
let v6 = screenattr(1, 6)
|
||||
let v7 = screenattr(1, 7)
|
||||
let v8 = screenattr(1, 8)
|
||||
let v9 = screenattr(1, 9)
|
||||
let v10 = screenattr(1, 10)
|
||||
call assert_equal([{'group': 'MyGroup1', 'id': 11, 'priority': 10, 'pos1': [1, 4, 2], 'pos2': [1, 9, 2]}], getmatches())
|
||||
call assert_notequal(v1, v4)
|
||||
call assert_equal(v5, v4)
|
||||
call assert_equal(v6, v1)
|
||||
call assert_equal(v7, v1)
|
||||
call assert_equal(v8, v4)
|
||||
call assert_equal(v9, v4)
|
||||
call assert_equal(v10, v1)
|
||||
|
||||
" Check, that setmatches() can correctly restore the matches from matchaddpos()
|
||||
call matchadd('MyGroup1', '\%2lmatchadd')
|
||||
let m=getmatches()
|
||||
call clearmatches()
|
||||
call setmatches(m)
|
||||
call assert_equal([{'group': 'MyGroup1', 'id': 11, 'priority': 10, 'pos1': [1, 4, 2], 'pos2': [1,9, 2]}, {'group': 'MyGroup1', 'pattern': '\%2lmatchadd', 'priority': 10, 'id': 12}], getmatches())
|
||||
endif
|
||||
|
||||
highlight MyGroup1 NONE
|
||||
highlight MyGroup2 NONE
|
||||
highlight MyGroup3 NONE
|
||||
endfunc
|
||||
|
||||
func Test_matchstrpos()
|
||||
call assert_equal(['ing', 4, 7], matchstrpos('testing', 'ing'))
|
||||
|
||||
call assert_equal(['ing', 4, 7], matchstrpos('testing', 'ing', 2))
|
||||
|
||||
call assert_equal(['', -1, -1], matchstrpos('testing', 'ing', 5))
|
||||
|
||||
call assert_equal(['ing', 1, 4, 7], matchstrpos(['vim', 'testing', 'execute'], 'ing'))
|
||||
|
||||
call assert_equal(['', -1, -1, -1], matchstrpos(['vim', 'testing', 'execute'], 'img'))
|
||||
endfunc
|
||||
|
||||
" vim: et ts=2 sw=2
|
||||
@ -1,13 +0,0 @@
|
||||
" Test matchstrpos
|
||||
|
||||
func Test_matchstrpos()
|
||||
call assert_equal(['ing', 4, 7], matchstrpos('testing', 'ing'))
|
||||
|
||||
call assert_equal(['ing', 4, 7], matchstrpos('testing', 'ing', 2))
|
||||
|
||||
call assert_equal(['', -1, -1], matchstrpos('testing', 'ing', 5))
|
||||
|
||||
call assert_equal(['ing', 1, 4, 7], matchstrpos(['vim', 'testing', 'execute'], 'ing'))
|
||||
|
||||
call assert_equal(['', -1, -1, -1], matchstrpos(['vim', 'testing', 'execute'], 'img'))
|
||||
endfunc
|
||||
@ -279,7 +279,7 @@ static int included_patches[] = {
|
||||
// 2166 NA
|
||||
// 2165,
|
||||
// 2164,
|
||||
// 2163,
|
||||
2163,
|
||||
2162,
|
||||
// 2161,
|
||||
// 2160,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user