patch 9.1.1681: tests: no test for actually moving cursor with 'acl'

Problem:  tests: no test for actually moving cursor when menu is not
          open with 'autocompletedelay'.
Solution: Use <Up> first in the test. Also remove two unnecessary <Esc>s
          in completion timeout test (zeertzjq).

closes: #18097

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/dumps/Test_autocompletedelay_10.dump b/src/testdir/dumps/Test_autocompletedelay_10.dump
index c404578cfd0d31fe3a35849c269d3a6b27549186..8ff1e123704929258249fccc8bf0a5e679d2b8c7 100644 (file)
--- a/src/testdir/dumps/Test_autocompletedelay_10.dump
+++ b/src/testdir/dumps/Test_autocompletedelay_10.dump
@@ -1,7 +1,7 @@
 |f+0&#ffffff0|o@1| @71
 |f|o@1|b|a|r| @68
-|f|o@1|b|a|r|b|a|z| @65
-|f> @73
+|f>o@1|b|a|r|b|a|z| @65
+|f| @73
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73

diff --git a/src/testdir/dumps/Test_autocompletedelay_11.dump b/src/testdir/dumps/Test_autocompletedelay_11.dump
new file mode 100644 (file)
index 0000000..c404578
--- /dev/null
+++ b/src/testdir/dumps/Test_autocompletedelay_11.dump
@@ -0,0 +1,10 @@
+|f+0&#ffffff0|o@1| @71
+|f|o@1|b|a|r| @68
+|f|o@1|b|a|r|b|a|z| @65
+|f> @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|-+2#0000000&@1| |I|N|S|E|R|T| |-@1| +0&&@62

diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 6205f87c036bb9b68ff7d06d86100fcd356f8bb5..f7a5c263755948a33b3e6dd603a51d488dfb72bb 100644 (file)
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -5495,7 +5495,6 @@ func Test_completetimeout_autocompletetimeout()
 
   " Clock does not have fine granularity, so checking 'elapsed time' is only
   " approximate. We can only test that some type of timeout is enforced.
-  call feedkeys("\<Esc>", 'xt!')
   call setline(1, map(range(60000), '"foo" . v:val'))
   set completetimeout=1
   call feedkeys("Gof\<C-N>\<F2>\<Esc>0", 'xt!')
@@ -5513,7 +5512,6 @@ func Test_completetimeout_autocompletetimeout()
   let match_count = len(b:matches->mapnew('v:val.word'))
   call assert_true(match_count < 50000)
 
-  call feedkeys("\<Esc>", 'xt!')
   set complete& omnifunc& autocomplete& autocompletetimeout& completetimeout&
   bwipe!
   %d
@@ -5563,8 +5561,10 @@ func Test_autocompletedelay()
 
   " When menu is not open Up/Down moves cursor to different line
   call term_sendkeys(buf, "\<Esc>Sf")
-  call term_sendkeys(buf, "\<Down>")
+  call term_sendkeys(buf, "\<Up>")
   call VerifyScreenDump(buf, 'Test_autocompletedelay_10', {})
+  call term_sendkeys(buf, "\<Down>")
+  call VerifyScreenDump(buf, 'Test_autocompletedelay_11', {})
 
   call term_sendkeys(buf, "\<esc>")
   call StopVimInTerminal(buf)

diff --git a/src/version.c b/src/version.c
index a53a039243d44485ee1b064dd41f2a7381ca4e0f..02c826e87ceb1b842734b39f847111cf2da34bdd 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -724,6 +724,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1681,
 /**/
     1680,
 /**/