Skip to content

Commit

Permalink
patch 8.0.1153: no tests for diff_hlID() and diff_filler()
Browse files Browse the repository at this point in the history
Problem:    No tests for diff_hlID() and diff_filler().
Solution:   Add tests. (Dominique Pelle, closes #2156)
  • Loading branch information
brammool committed Sep 26, 2017
1 parent 2a02745 commit 97fbc40
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 2 deletions.
45 changes: 43 additions & 2 deletions src/testdir/test_diffmode.vim
Expand Up @@ -420,7 +420,7 @@ func Test_setting_cursor()
new Xtest2
put =range(1,100)
wq

tabe Xtest2
$
diffsp Xtest1
Expand Down Expand Up @@ -501,7 +501,7 @@ func Test_diffpatch()
3
+ 4
.
saveas Xpatch
saveas! Xpatch
bwipe!
new
call assert_fails('diffpatch Xpatch', 'E816:')
Expand Down Expand Up @@ -547,6 +547,47 @@ func Test_diff_nomodifiable()
%bwipe!
endfunc

func Test_diff_hlID()
new
call setline(1, [1, 2, 3])
diffthis
vnew
call setline(1, ['1x', 2, 'x', 3])
diffthis
redraw

call assert_equal(synIDattr(diff_hlID(-1, 1), "name"), "")

call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange")
call assert_equal(synIDattr(diff_hlID(1, 2), "name"), "DiffText")
call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "")
call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "DiffAdd")
call assert_equal(synIDattr(diff_hlID(4, 1), "name"), "")

wincmd w
call assert_equal(synIDattr(diff_hlID(1, 1), "name"), "DiffChange")
call assert_equal(synIDattr(diff_hlID(2, 1), "name"), "")
call assert_equal(synIDattr(diff_hlID(3, 1), "name"), "")

%bwipe!
endfunc

func Test_diff_filler()
new
call setline(1, [1, 2, 3, 'x', 4])
diffthis
vnew
call setline(1, [1, 2, 'y', 'y', 3, 4])
diffthis
redraw

call assert_equal([0, 0, 0, 0, 0, 0, 0, 1, 0], map(range(-1, 7), 'diff_filler(v:val)'))
wincmd w
call assert_equal([0, 0, 0, 0, 2, 0, 0, 0], map(range(-1, 6), 'diff_filler(v:val)'))

%bwipe!
endfunc

func Test_diff_lastline()
enew!
only!
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -761,6 +761,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1153,
/**/
1152,
/**/
Expand Down

0 comments on commit 97fbc40

Please sign in to comment.