Mercurial > vim

changeset 35230:a05d0836b0a0 v9.1.0427

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0427: tests: some issues with termdebug mapping test Commit: https://github.com/vim/vim/commit/ffed1540f36eb4a2255d7d824c9466d3d8fd581e Author: Ken Takata <kentkt@csc.jp> Date: Tue May 21 17:14:56 2024 +0200 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>
author Christian Brabandt <cb@256bit.org>
date Tue, 21 May 2024 17:30:10 +0200
parents 925475d6ebae
children 225d94084c7f
files src/testdir/test_termdebug.vim src/version.c
diffstat 2 files changed, 36 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_termdebug.vim
+++ b/src/testdir/test_termdebug.vim
@@ -230,26 +230,26 @@ endfunc
 
 func Test_termdebug_mapping()
   %bw!
-  call assert_equal(maparg('K', 'n', 0, 1)->empty(), 1)
-  call assert_equal(maparg('-', 'n', 0, 1)->empty(), 1)
-  call assert_equal(maparg('+', 'n', 0, 1)->empty(), 1)
+  call assert_true(maparg('K', 'n', 0, 1)->empty())
+  call assert_true(maparg('-', 'n', 0, 1)->empty())
+  call assert_true(maparg('+', 'n', 0, 1)->empty())
   Termdebug
   call WaitForAssert({-> assert_equal(3, winnr('$'))})
   wincmd b
-  call assert_equal(maparg('K', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('-', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('+', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('K', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('-', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('+', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('K', 'n', 0, 1).rhs, ':Evaluate<CR>')
+  call assert_false(maparg('K', 'n', 0, 1)->empty())
+  call assert_false(maparg('-', 'n', 0, 1)->empty())
+  call assert_false(maparg('+', 'n', 0, 1)->empty())
+  call assert_false(maparg('K', 'n', 0, 1).buffer)
+  call assert_false(maparg('-', 'n', 0, 1).buffer)
+  call assert_false(maparg('+', 'n', 0, 1).buffer)
+  call assert_equal(':Evaluate<CR>', maparg('K', 'n', 0, 1).rhs)
   wincmd t
   quit!
   redraw!
   call WaitForAssert({-> assert_equal(1, winnr('$'))})
-  call assert_equal(maparg('K', 'n', 0, 1)->empty(), 1)
-  call assert_equal(maparg('-', 'n', 0, 1)->empty(), 1)
-  call assert_equal(maparg('+', 'n', 0, 1)->empty(), 1)
+  call assert_true(maparg('K', 'n', 0, 1)->empty())
+  call assert_true(maparg('-', 'n', 0, 1)->empty())
+  call assert_true(maparg('+', 'n', 0, 1)->empty())
 
   %bw!
   nnoremap K :echom "K"<cr>
@@ -258,24 +258,24 @@ func Test_termdebug_mapping()
   Termdebug
   call WaitForAssert({-> assert_equal(3, winnr('$'))})
   wincmd b
-  call assert_equal(maparg('K', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('-', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('+', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('K', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('-', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('+', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('K', 'n', 0, 1).rhs, ':Evaluate<CR>')
+  call assert_false(maparg('K', 'n', 0, 1)->empty())
+  call assert_false(maparg('-', 'n', 0, 1)->empty())
+  call assert_false(maparg('+', 'n', 0, 1)->empty())
+  call assert_false(maparg('K', 'n', 0, 1).buffer)
+  call assert_false(maparg('-', 'n', 0, 1).buffer)
+  call assert_false(maparg('+', 'n', 0, 1).buffer)
+  call assert_equal(':Evaluate<CR>', maparg('K', 'n', 0, 1).rhs)
   wincmd t
   quit!
   redraw!
   call WaitForAssert({-> assert_equal(1, winnr('$'))})
-  call assert_equal(maparg('K', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('-', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('+', 'n', 0, 1)->empty(), 0)
-  call assert_equal(maparg('K', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('-', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('+', 'n', 0, 1).buffer, 0)
-  call assert_equal(maparg('K', 'n', 0, 1).rhs, ':echom "K"<cr>')
+  call assert_false(maparg('K', 'n', 0, 1)->empty())
+  call assert_false(maparg('-', 'n', 0, 1)->empty())
+  call assert_false(maparg('+', 'n', 0, 1)->empty())
+  call assert_false(maparg('K', 'n', 0, 1).buffer)
+  call assert_false(maparg('-', 'n', 0, 1).buffer)
+  call assert_false(maparg('+', 'n', 0, 1).buffer)
+  call assert_equal(':echom "K"<cr>', maparg('K', 'n', 0, 1).rhs)
 
   %bw!
   nnoremap <buffer> K :echom "bK"<cr>
@@ -284,18 +284,18 @@ func Test_termdebug_mapping()
   Termdebug
   call WaitForAssert({-> assert_equal(3, winnr('$'))})
   wincmd b
-  call assert_equal(maparg('K', 'n', 0, 1).buffer, 1)
-  call assert_equal(maparg('-', 'n', 0, 1).buffer, 1)
-  call assert_equal(maparg('+', 'n', 0, 1).buffer, 1)
+  call assert_true(maparg('K', 'n', 0, 1).buffer)
+  call assert_true(maparg('-', 'n', 0, 1).buffer)
+  call assert_true(maparg('+', 'n', 0, 1).buffer)
   call assert_equal(maparg('K', 'n', 0, 1).rhs, ':echom "bK"<cr>')
   wincmd t
   quit!
   redraw!
   call WaitForAssert({-> assert_equal(1, winnr('$'))})
-  call assert_equal(maparg('K', 'n', 0, 1).buffer, 1)
-  call assert_equal(maparg('-', 'n', 0, 1).buffer, 1)
-  call assert_equal(maparg('+', 'n', 0, 1).buffer, 1)
-  call assert_equal(maparg('K', 'n', 0, 1).rhs, ':echom "bK"<cr>')
+  call assert_true(maparg('K', 'n', 0, 1).buffer)
+  call assert_true(maparg('-', 'n', 0, 1).buffer)
+  call assert_true(maparg('+', 'n', 0, 1).buffer)
+  call assert_equal(':echom "bK"<cr>', maparg('K', 'n', 0, 1).rhs)
 
   %bw!
 endfunc
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    427,
+/**/
     426,
 /**/
     425,