From 71b13e92ae580038b8aecbb783296c577ca2ba5a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 4 Feb 2019 21:14:45 +0100 Subject: [PATCH] patch 8.1.0875: not all errors of marks and findfile()/finddir() are tested Problem: Not all errors of marks and findfile()/finddir() are tested. Solution: Add more test coverage. (Dominique Pelle) --- src/testdir/test_findfile.vim | 16 ++++++++++++++ src/testdir/test_marks.vim | 41 +++++++++++++++++++++++++++++++++++ src/version.c | 2 ++ 3 files changed, 59 insertions(+) diff --git a/src/testdir/test_findfile.vim b/src/testdir/test_findfile.vim index 78e51ed83..0bae161a8 100644 --- a/src/testdir/test_findfile.vim +++ b/src/testdir/test_findfile.vim @@ -119,6 +119,14 @@ func Test_findfile() let &shellslash = save_shellslash endfunc +func Test_findfile_error() + call assert_fails('call findfile([])', 'E730:') + call assert_fails('call findfile("x", [])', 'E730:') + call assert_fails('call findfile("x", "", [])', 'E745:') + call assert_fails('call findfile("x", "**x")', 'E343:') + call assert_fails('call findfile("x", repeat("x", 5000))', 'E854:') +endfunc + " Test finddir({name} [, {path} [, {count}]]) func Test_finddir() let save_path = &path @@ -167,3 +175,11 @@ func Test_finddir() let &path = save_path let &shellslash = save_shellslash endfunc + +func Test_finddir_error() + call assert_fails('call finddir([])', 'E730:') + call assert_fails('call finddir("x", [])', 'E730:') + call assert_fails('call finddir("x", "", [])', 'E745:') + call assert_fails('call finddir("x", "**x")', 'E343:') + call assert_fails('call finddir("x", repeat("x", 5000))', 'E854:') +endfunc diff --git a/src/testdir/test_marks.vim b/src/testdir/test_marks.vim index 2fb95a536..a9bba5780 100644 --- a/src/testdir/test_marks.vim +++ b/src/testdir/test_marks.vim @@ -133,3 +133,44 @@ func Test_marks_cmd_multibyte() bwipe! endfunc + +func Test_delmarks() + new + norm mx + norm `x + delmarks x + call assert_fails('norm `x', 'E20:') + + " Deleting an already deleted mark should not fail. + delmarks x + + " Test deleting a range of marks. + norm ma + norm mb + norm mc + norm mz + delmarks b-z + norm `a + call assert_fails('norm `b', 'E20:') + call assert_fails('norm `c', 'E20:') + call assert_fails('norm `z', 'E20:') + call assert_fails('delmarks z-b', 'E475:') + + call assert_fails('delmarks', 'E471:') + call assert_fails('delmarks /', 'E475:') + + " Test delmarks! + norm mx + norm `x + delmarks! + call assert_fails('norm `x', 'E20:') + call assert_fails('delmarks! x', 'E474:') + + bwipe! +endfunc + +func Test_mark_error() + call assert_fails('mark', 'E471:') + call assert_fails('mark xx', 'E488:') + call assert_fails('mark _', 'E191:') +endfunc diff --git a/src/version.c b/src/version.c index 24a9fb31b..9b2e7c9f6 100644 --- a/src/version.c +++ b/src/version.c @@ -783,6 +783,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 875, /**/ 874, /**/ -- 2.40.0