patch 9.1.0427: tests: some issues with termdebug mapping test

Problem:  tests: some issues with termdebug mapping test
Solution: Use assert_{true,false} if suitable, change
          order of expected and actual arguments in assert() calls.
          (Ken Takata)

closes: #14818
related: 7fbbd7f

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Ken Takata
2024-05-21 17:14:56 +02:00
committed by Christian Brabandt
parent 8cf29e4c4a
commit ffed1540f3
2 changed files with 36 additions and 34 deletions

View File

@ -230,26 +230,26 @@ endfunc
func Test_termdebug_mapping() func Test_termdebug_mapping()
%bw! %bw!
call assert_equal(maparg('K', 'n', 0, 1)->empty(), 1) call assert_true(maparg('K', 'n', 0, 1)->empty())
call assert_equal(maparg('-', 'n', 0, 1)->empty(), 1) call assert_true(maparg('-', 'n', 0, 1)->empty())
call assert_equal(maparg('+', 'n', 0, 1)->empty(), 1) call assert_true(maparg('+', 'n', 0, 1)->empty())
Termdebug Termdebug
call WaitForAssert({-> assert_equal(3, winnr('$'))}) call WaitForAssert({-> assert_equal(3, winnr('$'))})
wincmd b wincmd b
call assert_equal(maparg('K', 'n', 0, 1)->empty(), 0) call assert_false(maparg('K', 'n', 0, 1)->empty())
call assert_equal(maparg('-', 'n', 0, 1)->empty(), 0) call assert_false(maparg('-', 'n', 0, 1)->empty())
call assert_equal(maparg('+', 'n', 0, 1)->empty(), 0) call assert_false(maparg('+', 'n', 0, 1)->empty())
call assert_equal(maparg('K', 'n', 0, 1).buffer, 0) call assert_false(maparg('K', 'n', 0, 1).buffer)
call assert_equal(maparg('-', 'n', 0, 1).buffer, 0) call assert_false(maparg('-', 'n', 0, 1).buffer)
call assert_equal(maparg('+', 'n', 0, 1).buffer, 0) call assert_false(maparg('+', 'n', 0, 1).buffer)
call assert_equal(maparg('K', 'n', 0, 1).rhs, ':Evaluate<CR>') call assert_equal(':Evaluate<CR>', maparg('K', 'n', 0, 1).rhs)
wincmd t wincmd t
quit! quit!
redraw! redraw!
call WaitForAssert({-> assert_equal(1, winnr('$'))}) call WaitForAssert({-> assert_equal(1, winnr('$'))})
call assert_equal(maparg('K', 'n', 0, 1)->empty(), 1) call assert_true(maparg('K', 'n', 0, 1)->empty())
call assert_equal(maparg('-', 'n', 0, 1)->empty(), 1) call assert_true(maparg('-', 'n', 0, 1)->empty())
call assert_equal(maparg('+', 'n', 0, 1)->empty(), 1) call assert_true(maparg('+', 'n', 0, 1)->empty())
%bw! %bw!
nnoremap K :echom "K"<cr> nnoremap K :echom "K"<cr>
@ -258,24 +258,24 @@ func Test_termdebug_mapping()
Termdebug Termdebug
call WaitForAssert({-> assert_equal(3, winnr('$'))}) call WaitForAssert({-> assert_equal(3, winnr('$'))})
wincmd b wincmd b
call assert_equal(maparg('K', 'n', 0, 1)->empty(), 0) call assert_false(maparg('K', 'n', 0, 1)->empty())
call assert_equal(maparg('-', 'n', 0, 1)->empty(), 0) call assert_false(maparg('-', 'n', 0, 1)->empty())
call assert_equal(maparg('+', 'n', 0, 1)->empty(), 0) call assert_false(maparg('+', 'n', 0, 1)->empty())
call assert_equal(maparg('K', 'n', 0, 1).buffer, 0) call assert_false(maparg('K', 'n', 0, 1).buffer)
call assert_equal(maparg('-', 'n', 0, 1).buffer, 0) call assert_false(maparg('-', 'n', 0, 1).buffer)
call assert_equal(maparg('+', 'n', 0, 1).buffer, 0) call assert_false(maparg('+', 'n', 0, 1).buffer)
call assert_equal(maparg('K', 'n', 0, 1).rhs, ':Evaluate<CR>') call assert_equal(':Evaluate<CR>', maparg('K', 'n', 0, 1).rhs)
wincmd t wincmd t
quit! quit!
redraw! redraw!
call WaitForAssert({-> assert_equal(1, winnr('$'))}) call WaitForAssert({-> assert_equal(1, winnr('$'))})
call assert_equal(maparg('K', 'n', 0, 1)->empty(), 0) call assert_false(maparg('K', 'n', 0, 1)->empty())
call assert_equal(maparg('-', 'n', 0, 1)->empty(), 0) call assert_false(maparg('-', 'n', 0, 1)->empty())
call assert_equal(maparg('+', 'n', 0, 1)->empty(), 0) call assert_false(maparg('+', 'n', 0, 1)->empty())
call assert_equal(maparg('K', 'n', 0, 1).buffer, 0) call assert_false(maparg('K', 'n', 0, 1).buffer)
call assert_equal(maparg('-', 'n', 0, 1).buffer, 0) call assert_false(maparg('-', 'n', 0, 1).buffer)
call assert_equal(maparg('+', 'n', 0, 1).buffer, 0) call assert_false(maparg('+', 'n', 0, 1).buffer)
call assert_equal(maparg('K', 'n', 0, 1).rhs, ':echom "K"<cr>') call assert_equal(':echom "K"<cr>', maparg('K', 'n', 0, 1).rhs)
%bw! %bw!
nnoremap <buffer> K :echom "bK"<cr> nnoremap <buffer> K :echom "bK"<cr>
@ -284,18 +284,18 @@ func Test_termdebug_mapping()
Termdebug Termdebug
call WaitForAssert({-> assert_equal(3, winnr('$'))}) call WaitForAssert({-> assert_equal(3, winnr('$'))})
wincmd b wincmd b
call assert_equal(maparg('K', 'n', 0, 1).buffer, 1) call assert_true(maparg('K', 'n', 0, 1).buffer)
call assert_equal(maparg('-', 'n', 0, 1).buffer, 1) call assert_true(maparg('-', 'n', 0, 1).buffer)
call assert_equal(maparg('+', 'n', 0, 1).buffer, 1) call assert_true(maparg('+', 'n', 0, 1).buffer)
call assert_equal(maparg('K', 'n', 0, 1).rhs, ':echom "bK"<cr>') call assert_equal(maparg('K', 'n', 0, 1).rhs, ':echom "bK"<cr>')
wincmd t wincmd t
quit! quit!
redraw! redraw!
call WaitForAssert({-> assert_equal(1, winnr('$'))}) call WaitForAssert({-> assert_equal(1, winnr('$'))})
call assert_equal(maparg('K', 'n', 0, 1).buffer, 1) call assert_true(maparg('K', 'n', 0, 1).buffer)
call assert_equal(maparg('-', 'n', 0, 1).buffer, 1) call assert_true(maparg('-', 'n', 0, 1).buffer)
call assert_equal(maparg('+', 'n', 0, 1).buffer, 1) call assert_true(maparg('+', 'n', 0, 1).buffer)
call assert_equal(maparg('K', 'n', 0, 1).rhs, ':echom "bK"<cr>') call assert_equal(':echom "bK"<cr>', maparg('K', 'n', 0, 1).rhs)
%bw! %bw!
endfunc endfunc

View File

@ -704,6 +704,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 */
/**/
427,
/**/ /**/
426, 426,
/**/ /**/