summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-02-20 19:21:36 +0100
committerBram Moolenaar <Bram@vim.org>2021-02-20 19:21:36 +0100
commita1070eae77f635f08b6f2612726b905796baaa58 (patch)
treeaa16207fd5f03cf3c913bb046a1e60948df980c9
parent5b5ae29bd3d7b832b6f15320430f7f191e0abd1f (diff)
patch 8.2.2534: missing test coveragev8.2.2534
Problem: Missing test coverage. Solution: Improve test coverage for completion with different encodings, mapset(), and term function failures. (Dominique Pellé, closes #7877)
-rw-r--r--src/testdir/test_edit.vim37
-rw-r--r--src/testdir/test_maparg.vim2
-rw-r--r--src/testdir/test_terminal3.vim5
-rw-r--r--src/version.c2
4 files changed, 29 insertions, 17 deletions
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
index de3e3a1612..6f083d95bd 100644
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -680,23 +680,26 @@ endfunc
func Test_edit_CTRL_N()
" Check keyword completion
- new
- set complete=.
- call setline(1, ['INFER', 'loWER', '', '', ])
- call cursor(3, 1)
- call feedkeys("Ai\<c-n>\<cr>\<esc>", "tnix")
- call feedkeys("ILO\<c-n>\<cr>\<esc>", 'tnix')
- call assert_equal(['INFER', 'loWER', 'i', 'LO', '', ''], getline(1, '$'))
- %d
- call setline(1, ['INFER', 'loWER', '', '', ])
- call cursor(3, 1)
- set ignorecase infercase
- call feedkeys("Ii\<c-n>\<cr>\<esc>", "tnix")
- call feedkeys("ILO\<c-n>\<cr>\<esc>", 'tnix')
- call assert_equal(['INFER', 'loWER', 'infer', 'LOWER', '', ''], getline(1, '$'))
-
- set noignorecase noinfercase complete&
- bw!
+ for e in ['latin1', 'utf-8']
+ exe 'set encoding=' .. e
+ new
+ set complete=.
+ call setline(1, ['INFER', 'loWER', '', '', ])
+ call cursor(3, 1)
+ call feedkeys("Ai\<c-n>\<cr>\<esc>", "tnix")
+ call feedkeys("ILO\<c-n>\<cr>\<esc>", 'tnix')
+ call assert_equal(['INFER', 'loWER', 'i', 'LO', '', ''], getline(1, '$'), e)
+ %d
+ call setline(1, ['INFER', 'loWER', '', '', ])
+ call cursor(3, 1)
+ set ignorecase infercase
+ call feedkeys("Ii\<c-n>\<cr>\<esc>", "tnix")
+ call feedkeys("ILO\<c-n>\<cr>\<esc>", 'tnix')
+ call assert_equal(['INFER', 'loWER', 'infer', 'LOWER', '', ''], getline(1, '$'), e)
+
+ set noignorecase noinfercase complete&
+ bw!
+ endfor
endfunc
func Test_edit_CTRL_O()
diff --git a/src/testdir/test_maparg.vim b/src/testdir/test_maparg.vim
index 285474d527..d0f2ec23f2 100644
--- a/src/testdir/test_maparg.vim
+++ b/src/testdir/test_maparg.vim
@@ -240,6 +240,8 @@ func Test_mapset()
bwipe!
call assert_fails('call mapset([], v:false, {})', 'E730:')
+ call assert_fails('call mapset("i", 0, "")', 'E716:')
+ call assert_fails('call mapset("i", 0, {})', 'E460:')
endfunc
func Check_ctrlb_map(d, check_alt)
diff --git a/src/testdir/test_terminal3.vim b/src/testdir/test_terminal3.vim
index eaf37e6745..037d935582 100644
--- a/src/testdir/test_terminal3.vim
+++ b/src/testdir/test_terminal3.vim
@@ -301,6 +301,11 @@ func Test_term_func_invalid_arg()
call assert_fails('let p = term_getansicolors([])', 'E745:')
call assert_fails('call term_setansicolors([], [])', 'E745:')
endif
+ let buf = term_start('echo')
+ call assert_fails('call term_setapi(' .. buf .. ', {})', 'E731:')
+ call assert_fails('call term_setkill(' .. buf .. ', {})', 'E731:')
+ call assert_fails('call term_setrestore(' .. buf .. ', {})', 'E731:')
+ exe buf . "bwipe!"
endfunc
" Test for sending various special keycodes to a terminal
diff --git a/src/version.c b/src/version.c
index f83f03879e..9363c3f5e6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2534,
+/**/
2533,
/**/
2532,