aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.1951: test for list and dict fails

Browse Source 
Problem:    Test for list and dict fails.
Solution:   Adjust for using an empty list/dict for a null one.
This commit is contained in:
Bram Moolenaar
2020-11-04 12:23:06 +01:00
parent 9c13f76275
commit 64ffa9b5fb
4 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/testdir/test_listdict.vim
View File

@@ -1000,7 +1000,8 @@ endfunc
" Test for a null list
func Test_null_list()
let l = test_null_list()
call assert_equal(0, join(l))
call assert_equal(0, join(test_null_list()))
call assert_equal('', join(l))
call assert_equal(0, len(l))
call assert_equal(1, empty(l))
call assert_fails('let s = join([1, 2], [])', 'E730:')
@@ -1008,8 +1009,10 @@ func Test_null_list()
call assert_equal([], l[:2])
call assert_true([] == l)
call assert_equal('[]', string(l))
call assert_equal(0, sort(l))
call assert_equal(0, uniq(l))
call assert_equal(0, sort(test_null_list()))
call assert_equal([], sort(l))
call assert_equal(0, uniq(test_null_list()))
call assert_equal([], uniq(l))
let k = [] + l
call assert_equal([], k)
let k = l + []
@@ -1019,15 +1022,20 @@ func Test_null_list()
call assert_equal([], deepcopy(l))
call assert_equal(5, get(l, 2, 5))
call assert_equal(-1, index(l, 2, 5))
call assert_equal(0, insert(l, 2, -1))
call assert_equal(0, insert(test_null_list(), 2, -1))
call assert_fails('call insert(l, 2, -1)', 'E684:')
call assert_equal(0, min(l))
call assert_equal(0, max(l))
call assert_equal(0, remove(l, 0, 2))
call assert_equal(0, remove(test_null_list(), 0, 2))
call assert_fails('call remove(l, 0, 2)', 'E684:')
call assert_equal([], repeat(l, 2))
call assert_equal(0, reverse(l))
call assert_equal(0, sort(l))
call assert_equal(0, reverse(test_null_list()))
call assert_equal([], reverse(l))
call assert_equal(0, sort(test_null_list()))
call assert_equal([], sort(l))
call assert_equal('[]', string(l))
call assert_equal(0, extend(l, l, 0))
call assert_fails('call extend(test_null_list(), test_null_list())', 'E1134:')
call assert_equal([], extend(l, l, 0))
lockvar l
call assert_equal(1, islocked('l'))
unlockvar l
@@ -1040,12 +1048,15 @@ func Test_null_dict()
call assert_equal({}, d)
call assert_equal(0, len(d))
call assert_equal(1, empty(d))
call assert_equal(0, items(d))
call assert_equal(0, keys(d))
call assert_equal(0, values(d))
call assert_equal(0, items(test_null_dict()))
call assert_equal([], items(d))
call assert_equal(0, keys(test_null_dict()))
call assert_equal([], keys(d))
call assert_equal(0, values(test_null_dict()))
call assert_equal([], values(d))
call assert_false(has_key(d, 'k'))
call assert_equal('{}', string(d))
call assert_fails('let x = d[10]')
call assert_fails('let x = d[10]', 'E716:')
call assert_equal({}, {})
call assert_equal(0, len(copy(d)))
call assert_equal(0, count(d, 'k'))
@@ -1053,9 +1064,11 @@ func Test_null_dict()
call assert_equal(20, get(d, 'k', 20))
call assert_equal(0, min(d))
call assert_equal(0, max(d))
call assert_equal(0, remove(d, 'k'))
call assert_equal(0, remove(test_null_dict(), 'k'))
call assert_fails("call remove(d, 'k')", 'E716:')
call assert_equal('{}', string(d))
call assert_equal(0, extend(d, d, 0))
call assert_fails('call extend(test_null_dict(), test_null_dict())', 'E1133:')
call assert_equal({}, extend(d, d, 'keep'))
lockvar d
call assert_equal(1, islocked('d'))
unlockvar d

4
src/testdir/test_python2.vim
View File

@@ -353,12 +353,12 @@ func Test_python_list()
call AssertException(["py t = vim.eval('[test_null_list()]')"],
\ 'Vim(python):SystemError: error return without exception set')
" Try to bind a null List variable
" Try to bind a null List variable (works because an empty list is used)
let cmds =<< trim END
let l = test_null_list()
py ll = vim.bindeval('l')
END
call AssertException(cmds, 'Vim(python):SystemError: error return without exception set')
call AssertException(cmds, '')
let l = []
py l = vim.bindeval('l')

5
src/testdir/test_python3.vim
View File

@@ -545,13 +545,12 @@ func Test_python3_list()
call AssertException(["py3 t = vim.eval('[test_null_list()]')"],
\ 'Vim(py3):SystemError: <built-in function eval> returned NULL without setting an error')
" Try to bind a null List variable
" Try to bind a null List variable (works because an empty list is used)
let cmds =<< trim END
let l = test_null_list()
py3 ll = vim.bindeval('l')
END
call AssertException(cmds,
\ 'Vim(py3):SystemError: <built-in function bindeval> returned NULL without setting an error')
call AssertException(cmds, '')
let l = []
py3 l = vim.bindeval('l')

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1951,
/**/
1950,
/**/