summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-12-15 13:48:30 +0000
committerBram Moolenaar <Bram@vim.org>2022-12-15 13:48:30 +0000
commit4cd45f1408321905019614b40a2173fe0456a96d (patch)
tree672e97284ddb8b6df92a10bb582ea725b5a8b934
parentba936f6f4e85cc1408bc3967f9fd7665d948909b (diff)
downloadvim-git-4cd45f1408321905019614b40a2173fe0456a96d.tar.gz
patch 9.0.1062: some test function names do not match what they are doingv9.0.1062
Problem: Some test function names do not match what they are doing. Solution: Leave out user data for the test that is called "NoUserData". (closes #11703)
-rw-r--r--src/testdir/test_ins_complete.vim11
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 6 deletions
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 582824f1c..1452e4d31 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -236,7 +236,7 @@ func s:CompleteDone_CompleteFuncDict( findstart, base )
\ 'menu': 'extra text',
\ 'info': 'words are cool',
\ 'kind': 'W',
- \ 'user_data': 'test'
+ \ 'user_data': ['one', 'two']
\ }
\ ]
\ }
@@ -252,7 +252,7 @@ func s:CompleteDone_CheckCompletedItemDict(pre)
call assert_equal( 'extra text', v:completed_item[ 'menu' ] )
call assert_equal( 'words are cool', v:completed_item[ 'info' ] )
call assert_equal( 'W', v:completed_item[ 'kind' ] )
- call assert_equal( 'test', v:completed_item[ 'user_data' ] )
+ call assert_equal( ['one', 'two'], v:completed_item[ 'user_data' ] )
if a:pre
call assert_equal('function', complete_info().mode)
@@ -285,7 +285,7 @@ func Test_CompleteDoneDict()
execute "normal a\<C-X>\<C-U>\<C-Y>"
set completefunc&
- call assert_equal('test', v:completed_item[ 'user_data' ])
+ call assert_equal(['one', 'two'], v:completed_item[ 'user_data' ])
call assert_true(s:called_completedone)
let s:called_completedone = 0
@@ -305,7 +305,6 @@ func s:CompleteDone_CompleteFuncDictNoUserData(findstart, base)
\ 'menu': 'extra text',
\ 'info': 'words are cool',
\ 'kind': 'W',
- \ 'user_data': ['one', 'two'],
\ }
\ ]
\ }
@@ -317,7 +316,7 @@ func s:CompleteDone_CheckCompletedItemDictNoUserData()
call assert_equal( 'extra text', v:completed_item[ 'menu' ] )
call assert_equal( 'words are cool', v:completed_item[ 'info' ] )
call assert_equal( 'W', v:completed_item[ 'kind' ] )
- call assert_equal( ['one', 'two'], v:completed_item[ 'user_data' ] )
+ call assert_equal( '', v:completed_item[ 'user_data' ] )
let s:called_completedone = 1
endfunc
@@ -329,7 +328,7 @@ func Test_CompleteDoneDictNoUserData()
execute "normal a\<C-X>\<C-U>\<C-Y>"
set completefunc&
- call assert_equal(['one', 'two'], v:completed_item[ 'user_data' ])
+ call assert_equal('', v:completed_item[ 'user_data' ])
call assert_true(s:called_completedone)
let s:called_completedone = 0
diff --git a/src/version.c b/src/version.c
index 8250a919b..097c0a6a2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1062,
+/**/
1061,
/**/
1060,