Mercurial > vim
changeset 16668:81be817c9d9a v8.1.1336
patch 8.1.1336: some eval functionality is not covered by tests
commit https://github.com/vim/vim/commit/17aca707f92235b6f962e637e8073162d18e6de2
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu May 16 22:24:55 2019 +0200
patch 8.1.1336: some eval functionality is not covered by tests
Problem: Some eval functionality is not covered by tests.
Solution: Add a few more test cases. (Masato Nishihata, closes https://github.com/vim/vim/issues/4374)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 16 May 2019 22:30:06 +0200 |
| parents | a9680e0ff089 |
| children | e4bdd8a2b0c2 |
| files | src/testdir/test_bufline.vim src/testdir/test_cindent.vim src/testdir/test_cursor_func.vim src/testdir/test_delete.vim src/testdir/test_expand_func.vim src/testdir/test_float_func.vim src/testdir/test_fnamemodify.vim src/testdir/test_functions.vim src/version.c |
| diffstat | 9 files changed, 62 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -8,7 +8,7 @@ func Test_setbufline_getbufline() hide call assert_equal(0, setbufline(b, 1, ['foo', 'bar'])) call assert_equal(['foo'], getbufline(b, 1)) - call assert_equal(['bar'], getbufline(b, 2)) + call assert_equal(['bar'], getbufline(b, '$')) call assert_equal(['foo', 'bar'], getbufline(b, 1, 2)) exe "bd!" b call assert_equal([], getbufline(b, 1, 2)) @@ -81,6 +81,7 @@ func Test_appendbufline() call setline(1, ['a', 'b', 'c']) let b = bufnr('%') wincmd w + call assert_equal(1, appendbufline(b, -1, ['x'])) call assert_equal(1, appendbufline(b, 4, ['x'])) call assert_equal(1, appendbufline(1234, 1, ['x'])) call assert_equal(0, appendbufline(b, 3, ['d', 'e'])) @@ -130,8 +131,11 @@ func Test_deletebufline() exe "bd!" b call assert_equal(1, deletebufline(b, 1)) + call assert_equal(1, deletebufline(-1, 1)) + split Xtest call setline(1, ['a', 'b', 'c']) + call cursor(line('$'), 1) let b = bufnr('%') wincmd w call assert_equal(1, deletebufline(b, 4))
--- a/src/testdir/test_cindent.vim +++ b/src/testdir/test_cindent.vim @@ -102,4 +102,14 @@ func Test_cindent_expr() bw! endfunc +func Test_cindent_func() + new + setlocal cindent + call setline(1, ['int main(void)', '{', 'return 0;', '}']) + call assert_equal(cindent(0), -1) + call assert_equal(cindent(3), &sw) + call assert_equal(cindent(line('$')+1), -1) + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab
--- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -25,6 +25,12 @@ func Test_move_cursor() call cursor(9, 1) call assert_equal([4, 1, 0, 1], getcurpos()[1:]) + call setline(1, ["\<TAB>"]) + call cursor(1, 1, 1) + call assert_equal([1, 1, 1], getcurpos()[1:3]) + + call assert_equal(-1, cursor(-1, -1)) + quit! endfunc
--- a/src/testdir/test_delete.vim +++ b/src/testdir/test_delete.vim @@ -105,3 +105,8 @@ func Test_symlink_recursive_delete() bwipe Xdir3/subdir/Xfile bwipe Xdir4/Xfile endfunc + +func Test_delete_errors() + call assert_fails('call delete('''')', 'E474:') + call assert_fails('call delete(''foo'', 0)', 'E15:') +endfunc
--- a/src/testdir/test_expand_func.vim +++ b/src/testdir/test_expand_func.vim @@ -64,3 +64,12 @@ func Test_expand_sflnum() call assert_equal(64, str2nr(trim(execute('Flnum')))) delcommand Flnum endfunc + +func Test_expand() + new + call assert_equal("", expand('%:S')) + call assert_equal('3', expand('<slnum>')) + call assert_equal(['4'], expand('<slnum>', v:false, v:true)) + " Don't add any line above this, otherwise <slnum> will change. + quit +endfunc
--- a/src/testdir/test_float_func.vim +++ b/src/testdir/test_float_func.vim @@ -13,6 +13,7 @@ func Test_abs() call assert_equal('inf', string(abs(1.0/0.0))) call assert_equal('inf', string(abs(-1.0/0.0))) call assert_equal('nan', string(abs(0.0/0.0))) + call assert_equal('12', string(abs('12abc'))) call assert_equal('12', string(abs('-12abc'))) call assert_fails("call abs([])", 'E745:') call assert_fails("call abs({})", 'E728:')
--- a/src/testdir/test_fnamemodify.vim +++ b/src/testdir/test_fnamemodify.vim @@ -45,9 +45,3 @@ func Test_fnamemodify() let $HOME = save_home let &shell = save_shell endfunc - -func Test_expand() - new - call assert_equal("", expand('%:S')) - quit -endfunc
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -52,6 +52,7 @@ func Test_empty() endif call assert_equal(0, empty(function('Test_empty'))) + call assert_equal(0, empty(function('Test_empty', [0]))) endfunc func Test_len() @@ -869,6 +870,7 @@ func Test_count() call assert_equal(1, count(l, 'a', 0, 1)) call assert_equal(2, count(l, 'a', 1, 1)) call assert_fails('call count(l, "a", 0, 10)', 'E684:') + call assert_fails('call count(l, "a", [])', 'E745:') let d = {1: 'a', 2: 'a', 3: 'A', 4: 'b'} call assert_equal(2, count(d, 'a')) @@ -896,6 +898,8 @@ func Test_count() call assert_equal(2, count("foo", "O", 1)) call assert_equal(2, count("fooooo", "oo")) call assert_equal(0, count("foo", "")) + + call assert_fails('call count(0, 0)', 'E712:') endfunc func Test_changenr() @@ -1431,3 +1435,23 @@ func Test_readdir() call delete('Xdir', 'rf') endfunc + +func Test_call() + call assert_equal(3, call('len', [123])) + call assert_fails("call call('len', 123)", 'E714:') + call assert_equal(0, call('', [])) + + function Mylen() dict + return len(self.data) + endfunction + let mydict = {'data': [0, 1, 2, 3], 'len': function("Mylen")} + call assert_fails("call call('Mylen', [], 0)", 'E715:') +endfunc + +func Test_char2nr() + call assert_equal(12354, char2nr('あ', 1)) +endfunc + +func Test_eventhandler() + call assert_equal(0, eventhandler()) +endfunc