From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 26 Sep 2017 17:41:46 +0000 (+0200)
Subject: patch 8.0.1153: no tests for diff_hlID() and diff_filler()
X-Git-Tag: v8.0.1153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97fbc404fc56f76df12b2d2658b1d6efda28d5dd;p=vim

patch 8.0.1153: no tests for diff_hlID() and diff_filler()

Problem:    No tests for diff_hlID() and diff_filler().
Solution:   Add tests. (Dominique Pelle, closes #2156)
---

diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 3625a68e5..c1dcfb805 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -420,7 +420,7 @@ func Test_setting_cursor()
   new Xtest2
   put =range(1,100)
   wq
-  
+
   tabe Xtest2
   $
   diffsp Xtest1
@@ -501,7 +501,7 @@ func Test_diffpatch()
   3
 + 4
 .
-  saveas Xpatch
+  saveas! Xpatch
   bwipe!
   new
   call assert_fails('diffpatch Xpatch', 'E816:')
@@ -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!
diff --git a/src/version.c b/src/version.c
index 2126c969e..b63246e74 100644
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1153,
 /**/
     1152,
 /**/