Mercurial > vim
changeset 8895:7f29248d5789 v7.4.1734
commit https://github.com/vim/vim/commit/0f518a8f4d4be4cac10389680f6bd5e3781f94b0
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 14 16:57:10 2016 +0200
patch 7.4.1734
Problem: Test fails when not using utf-8.
Solution: Split test in regularand utf-8 part.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 14 Apr 2016 17:00:05 +0200 |
| parents | fb27c2029d7b |
| children | fc57c7ed0642 |
| files | src/testdir/test_alot_utf8.vim src/testdir/test_expr.vim src/testdir/test_expr_utf8.vim src/version.c |
| diffstat | 4 files changed, 29 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_alot_utf8.vim +++ b/src/testdir/test_alot_utf8.vim @@ -4,4 +4,5 @@ " These tests use utf8 'encoding'. Setting 'encoding' is in the individual " files, so that they can be run by themselves. +source test_expr_utf8.vim source test_regexp_utf8.vim
--- a/src/testdir/test_expr.vim +++ b/src/testdir/test_expr.vim @@ -59,17 +59,6 @@ func Test_strgetchar() call assert_equal(-1, strgetchar('axb', -1)) call assert_equal(-1, strgetchar('axb', 3)) call assert_equal(-1, strgetchar('', 0)) - - if !has('multi_byte') - return - endif - - call assert_equal(char2nr('á'), strgetchar('áxb', 0)) - call assert_equal(char2nr('x'), strgetchar('áxb', 1)) - - call assert_equal(char2nr('a'), strgetchar('àxb', 0)) - call assert_equal(char2nr('̀'), strgetchar('àxb', 1)) - call assert_equal(char2nr('x'), strgetchar('àxb', 2)) endfunc func Test_strcharpart() @@ -84,16 +73,4 @@ func Test_strcharpart() call assert_equal('', strcharpart('axb', -2, 2)) call assert_equal('a', strcharpart('axb', -1, 2)) - - if !has('multi_byte') - return - endif - - call assert_equal('áxb', strcharpart('áxb', 0)) - call assert_equal('á', strcharpart('áxb', 0, 1)) - call assert_equal('x', strcharpart('áxb', 1, 1)) - - call assert_equal('a', strcharpart('àxb', 0, 1)) - call assert_equal('̀', strcharpart('àxb', 1, 1)) - call assert_equal('x', strcharpart('àxb', 2, 1)) endfunc
new file mode 100644 --- /dev/null +++ b/src/testdir/test_expr_utf8.vim @@ -0,0 +1,26 @@ +" Tests for expressions using utf-8. +if !has('multi_byte') + finish +endif +set encoding=utf-8 +scriptencoding utf-8 + +func Test_strgetchar() + call assert_equal(char2nr('a'), strgetchar('axb', 0)) + call assert_equal(char2nr('x'), strgetchar('axb', 1)) + call assert_equal(char2nr('b'), strgetchar('axb', 2)) + + call assert_equal(-1, strgetchar('axb', -1)) + call assert_equal(-1, strgetchar('axb', 3)) + call assert_equal(-1, strgetchar('', 0)) +endfunc + +func Test_strcharpart() + call assert_equal('áxb', strcharpart('áxb', 0)) + call assert_equal('á', strcharpart('áxb', 0, 1)) + call assert_equal('x', strcharpart('áxb', 1, 1)) + + call assert_equal('a', strcharpart('àxb', 0, 1)) + call assert_equal('̀', strcharpart('àxb', 1, 1)) + call assert_equal('x', strcharpart('àxb', 2, 1)) +endfunc