diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-03 18:51:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-03 18:51:54 +0100 |
| commit | 35efa22ff2b98126363098db9304796b5624f97f (patch) | |
| tree | 9cacd09d619387f44adfa4e5aa48540d97b7d327 | |
| parent | 0d90e728fe089ff1bb34d6a17f5591a96b57f734 (diff) | |
| download | vim-git-35efa22ff2b98126363098db9304796b5624f97f.tar.gz | |
patch 8.2.1946: sort() with NULL string not testedv8.2.1946
Problem: sort() with NULL string not tested.
Solution: Add a test. use v:collate. (Dominique Pellé, closes #7247)
| -rw-r--r-- | src/testdir/test_sort.vim | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim index 244678ea9..07f0d0c0a 100644 --- a/src/testdir/test_sort.vim +++ b/src/testdir/test_sort.vim @@ -24,21 +24,25 @@ func Test_sort_strings() " This does not appear to work correctly on Mac. if !has('mac') - let lc = execute('language collate') " With the following locales, the accentuated letters are ordered " similarly to the non-accentuated letters... - if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"' + if v:collate =~? '^\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8$' call assert_equal(['a', 'A', 'ä', 'Ä', 'o', 'O', 'ô', 'Ô', 'œ', 'œ', 'p', 'P'], \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l')) " ... whereas with a Swedish locale, the accentuated letters are ordered " after Z. - elseif lc =~? '"sv.*utf-\?8"' + elseif v:collate =~? '^sv.*utf-\?8$' call assert_equal(['a', 'A', 'o', 'O', 'p', 'P', 'ä', 'Ä', 'œ', 'œ', 'ô', 'Ô'], \ sort(['A', 'a', 'o', 'O', 'œ', 'œ', 'p', 'P', 'Ä', 'ä', 'ô', 'Ô'], 'l')) endif endif endfunc +func Test_sort_null_string() + " null strings are sorted as empty strings. + call assert_equal(['', 'a', 'b'], sort(['b', test_null_string(), 'a'])) +endfunc + func Test_sort_numeric() call assert_equal([1, 2, 3], sort([3, 2, 1], 'n')) call assert_equal([3, 13, 28], sort([13, 28, 3], 'n')) @@ -1229,8 +1233,7 @@ func Test_sort_cmd() " With the following locales, the accentuated letters are ordered " similarly to the non-accentuated letters. " This does not appear to work on Mac - let lc = execute('language collate') - if lc =~? '"\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8"' && !has('mac') + if v:collate =~? '^\(en\|es\|de\|fr\|it\|nl\).*\.utf-\?8$' && !has('mac') let tests += [ \ { \ 'name' : 'sort with locale', diff --git a/src/version.c b/src/version.c index 8052de8d5..3f2affe3b 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 */ /**/ + 1946, +/**/ 1945, /**/ 1944, |