aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.1734

Browse Source 
Problem:    Test fails when not using utf-8.
Solution:   Split test in regularand utf-8 part.
This commit is contained in:
Bram Moolenaar
2016-04-14 16:57:10 +02:00
parent 839e954aaa
commit 0f518a8f4d
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/testdir/test_alot_utf8.vim
View File

@@ -4,4 +4,5 @@
" These tests use utf8 'encoding'. Setting 'encoding' is in the individual " These tests use utf8 'encoding'. Setting 'encoding' is in the individual
" files, so that they can be run by themselves. " files, so that they can be run by themselves.
source test_expr_utf8.vim
source test_regexp_utf8.vim source test_regexp_utf8.vim

23
src/testdir/test_expr.vim
View File

@@ -59,17 +59,6 @@ func Test_strgetchar()
call assert_equal(-1, strgetchar('axb', -1)) call assert_equal(-1, strgetchar('axb', -1))
call assert_equal(-1, strgetchar('axb', 3)) call assert_equal(-1, strgetchar('axb', 3))
call assert_equal(-1, strgetchar('', 0)) 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 endfunc
func Test_strcharpart() func Test_strcharpart()
@@ -84,16 +73,4 @@ func Test_strcharpart()
call assert_equal('', strcharpart('axb', -2, 2)) call assert_equal('', strcharpart('axb', -2, 2))
call assert_equal('a', strcharpart('axb', -1, 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 endfunc

26
src/testdir/test_expr_utf8.vim Normal file
View File

@@ -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

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1734,
/**/ /**/
1733, 1733,
/**/ /**/