diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-27 08:26:09 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-10-27 08:30:16 +0800 |
| commit | bd122494cc3012a4885a55663e7c158c7a402878 (patch) | |
| tree | d4f7c5006a813b0c1556e50c7bab1cea5876f8a3 | |
| parent | 245e6c5b305a0f32c39c88df8c0bf3c38505cc60 (diff) | |
| download | rneovim-bd122494cc3012a4885a55663e7c158c7a402878.tar.gz rneovim-bd122494cc3012a4885a55663e7c158c7a402878.tar.bz2 rneovim-bd122494cc3012a4885a55663e7c158c7a402878.zip | |
vim-patch:8.2.2100: insufficient testing for function range and dict
Problem: Insufficient testing for function range and dict.
Solution: Add a few tests. (Dominique Pellé, closes vim/vim#7428)
https://github.com/vim/vim/commit/67322bf74a106b6476b093e75da87d61e2181b76
| -rw-r--r-- | src/nvim/testdir/test_functions.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_lambda.vim | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_signals.vim | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_user_func.vim | 32 |
4 files changed, 39 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_functions.vim b/src/nvim/testdir/test_functions.vim index 1b9b9abd91..b751215b79 100644 --- a/src/nvim/testdir/test_functions.vim +++ b/src/nvim/testdir/test_functions.vim @@ -1865,6 +1865,7 @@ func Test_call() let mydict = {'data': [0, 1, 2, 3], 'len': function("Mylen")} eval mydict.len->call([], mydict)->assert_equal(4) call assert_fails("call call('Mylen', [], 0)", 'E715:') + call assert_fails('call foo', 'E107:') endfunc func Test_char2nr() diff --git a/src/nvim/testdir/test_lambda.vim b/src/nvim/testdir/test_lambda.vim index 3c12c7b02e..ce15243993 100644 --- a/src/nvim/testdir/test_lambda.vim +++ b/src/nvim/testdir/test_lambda.vim @@ -245,6 +245,11 @@ func Test_closure_counter() call assert_equal(2, l:F()) call assert_equal(3, l:F()) call assert_equal(4, l:F()) + + call assert_match("^\n function <SNR>\\d\\+_bar() closure" + \ .. "\n1 let x += 1" + \ .. "\n2 return x" + \ .. "\n endfunction$", execute('func s:bar')) endfunc func Test_closure_unlet() diff --git a/src/nvim/testdir/test_signals.vim b/src/nvim/testdir/test_signals.vim index 719f90c808..e1c6e5d11f 100644 --- a/src/nvim/testdir/test_signals.vim +++ b/src/nvim/testdir/test_signals.vim @@ -129,8 +129,7 @@ func Test_deadly_signal_TERM() call assert_equal(['foo'], getline(1, '$')) let result = readfile('XautoOut') - call assert_match('VimLeavePre triggered', result[0]) - call assert_match('VimLeave triggered', result[1]) + call assert_equal(["VimLeavePre triggered", "VimLeave triggered"], result) %bwipe! call delete('.Xsig_TERM.swp') diff --git a/src/nvim/testdir/test_user_func.vim b/src/nvim/testdir/test_user_func.vim index 8b5ee72bf1..5041fa9ad4 100644 --- a/src/nvim/testdir/test_user_func.vim +++ b/src/nvim/testdir/test_user_func.vim @@ -445,4 +445,36 @@ func Test_func_arg_error() delfunc Xfunc endfunc +func Test_func_dict() + let mydict = {'a': 'b'} + function mydict.somefunc() dict + return len(self) + endfunc + + call assert_equal("{'a': 'b', 'somefunc': function('2')}", string(mydict)) + call assert_equal(2, mydict.somefunc()) + call assert_match("^\n function \\d\\\+() dict" + \ .. "\n1 return len(self)" + \ .. "\n endfunction$", execute('func mydict.somefunc')) +endfunc + +func Test_func_range() + new + call setline(1, range(1, 8)) + func FuncRange() range + echo a:firstline + echo a:lastline + endfunc + 3 + call assert_equal("\n3\n3", execute('call FuncRange()')) + call assert_equal("\n4\n6", execute('4,6 call FuncRange()')) + call assert_equal("\n function FuncRange() range" + \ .. "\n1 echo a:firstline" + \ .. "\n2 echo a:lastline" + \ .. "\n endfunction", + \ execute('function FuncRange')) + + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab |