diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-03-13 13:14:04 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-03-13 13:14:04 +0100 |
commit | 6fd367a97c8653a2d734a38252c7d68d4b2ebaa7 (patch) | |
tree | 4b52fc3527af8e939ba9fe3bff0acb81d61a6bb4 | |
parent | c80f647512b001fb6952ed10d076d56c3d4b84e0 (diff) | |
download | vim-git-6fd367a97c8653a2d734a38252c7d68d4b2ebaa7.tar.gz |
patch 8.2.2592: code coverage could be improvedv8.2.2592
Problem: Code coverage could be improved.
Solution: Add a few more tests. (Dominique Pellé, closes #7957)
-rw-r--r-- | src/testdir/test_fileformat.vim | 9 | ||||
-rw-r--r-- | src/testdir/test_normal.vim | 7 | ||||
-rw-r--r-- | src/testdir/test_sleep.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_textformat.vim | 15 | ||||
-rw-r--r-- | src/testdir/test_viminfo.vim | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
6 files changed, 38 insertions, 0 deletions
diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim index 09be25822..07819dc2e 100644 --- a/src/testdir/test_fileformat.vim +++ b/src/testdir/test_fileformat.vim @@ -33,6 +33,15 @@ func Test_fileformat_autocommand() bw! endfunc +func Test_fileformat_nomodifiable() + new + setlocal nomodifiable + + call assert_fails('set fileformat=latin1', 'E21:') + + bw +endfunc + " Convert the contents of a file into a literal string func s:file2str(fname) let b = readfile(a:fname, 'B') diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim index 8aef41ddd..75b52bcb6 100644 --- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -3207,6 +3207,13 @@ func Test_normal_delete_cmd() " delete to a readonly register call setline(1, ['abcd']) call assert_beeps('normal ":d2l') + + " D and d with 'nomodifiable' + call setline(1, ['abcd']) + setlocal nomodifiable + call assert_fails('normal D', 'E21:') + call assert_fails('normal d$', 'E21:') + close! endfunc diff --git a/src/testdir/test_sleep.vim b/src/testdir/test_sleep.vim index f71855fd4..a428f380b 100644 --- a/src/testdir/test_sleep.vim +++ b/src/testdir/test_sleep.vim @@ -21,6 +21,7 @@ func! Test_sleep_bang() call s:assert_takes_longer('sl 50m', 50) call s:assert_takes_longer('sl! 50m', 50) call s:assert_takes_longer('1sleep', 1000) + call s:assert_takes_longer('normal 1gs', 1000) endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/testdir/test_textformat.vim b/src/testdir/test_textformat.vim index eac1c1980..32ff3cc70 100644 --- a/src/testdir/test_textformat.vim +++ b/src/testdir/test_textformat.vim @@ -858,6 +858,21 @@ func Test_mps_latin1() close! endfunc +func Test_mps_error() + let encoding_save = &encoding + + for e in ['utf-8', 'latin1'] + exe 'set encoding=' .. e + + call assert_fails('set mps=<:', 'E474:', e) + call assert_fails('set mps=:>', 'E474:', e) + call assert_fails('set mps=<>', 'E474:', e) + call assert_fails('set mps=<:>_', 'E474:', e) + endfor + + let &encoding = encoding_save +endfunc + " Test for ra on multi-byte characters func Test_ra_multibyte() new diff --git a/src/testdir/test_viminfo.vim b/src/testdir/test_viminfo.vim index cb090ce5c..ef74e09db 100644 --- a/src/testdir/test_viminfo.vim +++ b/src/testdir/test_viminfo.vim @@ -906,6 +906,10 @@ func Test_viminfo_oldfiles_newfile() call delete('Xviminfofile') call delete('Xviminfotest') call delete('Xnew-file.txt') + + let v:oldfiles = test_null_list() + call assert_equal("\nNo old files", execute('oldfiles')) + let &viminfo = save_viminfo let &viminfofile = save_viminfofile endfunc diff --git a/src/version.c b/src/version.c index 76a95b9b6..c6866a297 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 */ /**/ + 2592, +/**/ 2591, /**/ 2590, |