mirror of
https://github.com/vim/vim.git
synced 2025-10-13 06:54:15 -04:00
patch 9.0.1062: some test function names do not match what they are doing
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)
This commit is contained in:
@@ -236,7 +236,7 @@ func s:CompleteDone_CompleteFuncDict( findstart, base )
|
|||||||
\ 'menu': 'extra text',
|
\ 'menu': 'extra text',
|
||||||
\ 'info': 'words are cool',
|
\ 'info': 'words are cool',
|
||||||
\ 'kind': 'W',
|
\ '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( 'extra text', v:completed_item[ 'menu' ] )
|
||||||
call assert_equal( 'words are cool', v:completed_item[ 'info' ] )
|
call assert_equal( 'words are cool', v:completed_item[ 'info' ] )
|
||||||
call assert_equal( 'W', v:completed_item[ 'kind' ] )
|
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
|
if a:pre
|
||||||
call assert_equal('function', complete_info().mode)
|
call assert_equal('function', complete_info().mode)
|
||||||
@@ -285,7 +285,7 @@ func Test_CompleteDoneDict()
|
|||||||
execute "normal a\<C-X>\<C-U>\<C-Y>"
|
execute "normal a\<C-X>\<C-U>\<C-Y>"
|
||||||
set completefunc&
|
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)
|
call assert_true(s:called_completedone)
|
||||||
|
|
||||||
let s:called_completedone = 0
|
let s:called_completedone = 0
|
||||||
@@ -305,7 +305,6 @@ func s:CompleteDone_CompleteFuncDictNoUserData(findstart, base)
|
|||||||
\ 'menu': 'extra text',
|
\ 'menu': 'extra text',
|
||||||
\ 'info': 'words are cool',
|
\ 'info': 'words are cool',
|
||||||
\ 'kind': 'W',
|
\ '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( 'extra text', v:completed_item[ 'menu' ] )
|
||||||
call assert_equal( 'words are cool', v:completed_item[ 'info' ] )
|
call assert_equal( 'words are cool', v:completed_item[ 'info' ] )
|
||||||
call assert_equal( 'W', v:completed_item[ 'kind' ] )
|
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
|
let s:called_completedone = 1
|
||||||
endfunc
|
endfunc
|
||||||
@@ -329,7 +328,7 @@ func Test_CompleteDoneDictNoUserData()
|
|||||||
execute "normal a\<C-X>\<C-U>\<C-Y>"
|
execute "normal a\<C-X>\<C-U>\<C-Y>"
|
||||||
set completefunc&
|
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)
|
call assert_true(s:called_completedone)
|
||||||
|
|
||||||
let s:called_completedone = 0
|
let s:called_completedone = 0
|
||||||
|
@@ -695,6 +695,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1062,
|
||||||
/**/
|
/**/
|
||||||
1061,
|
1061,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user