summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-17 20:30:44 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-17 20:30:44 +0200
commite17f8817a1713a1ef20257c777a483b7ab57a841 (patch)
treee0bff85634df736d2c6640d66546f1e36023c7fe
parent9bb3eb3e02a942fb71a4c1ce913f938d0ddf82d5 (diff)
downloadvim-git-e17f8817a1713a1ef20257c777a483b7ab57a841.tar.gz
patch 8.2.0995: insufficient testing for the readdir() sort optionv8.2.0995
Problem: Insufficient testing for the readdir() sort option. Solution: Add a few more tests. (Christian Brabandt, closes #6278)
-rw-r--r--src/testdir/test_functions.vim19
-rw-r--r--src/version.c2
2 files changed, 21 insertions, 0 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index d0686eff3..6e5409551 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -2014,6 +2014,25 @@ func Test_readdir_sort()
let files = readdir(dir, '1', #{sort: 'icase'})
call assert_equal(default->sort('i'), files, 'sort by ignoring case')
+ " 4) collation
+ let collate = v:collate
+ lang collate C
+ let files = readdir(dir, 1, #{sort: 'collate'})
+ call assert_equal(default->sort(), files, 'sort by C collation')
+ exe "lang collate" collate
+
+ " 5) Errors
+ call assert_fails('call readdir(dir, 1, 1)', 'E715')
+ call assert_fails('call readdir(dir, 1, #{sorta: 1})')
+ call assert_fails('call readdirex(dir, 1, #{sorta: 1})')
+
+ " 6) ignore other values in dict
+ let files = readdir(dir, '1', #{sort: 'c'})
+ call assert_equal(default, files, 'sort using default2')
+
+ " Cleanup
+ exe "lang collate" collate
+
eval dir->delete('rf')
endfunc
diff --git a/src/version.c b/src/version.c
index a5c6de5f3..509ef2222 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 995,
+/**/
994,
/**/
993,