Mercurial > vim

diff src/testdir/test_diffmode.vim @ 17614:d7708560b77c v8.1.1804

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1804: no test for display updating without a scroll region commit https://github.com/vim/vim/commit/3c8ee629745737aa231fdd123826ae021e398e49 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 3 22:55:50 2019 +0200 patch 8.1.1804: no test for display updating without a scroll region Problem: No test for display updating without a scroll region. Solution: Add a test.
author Bram Moolenaar <Bram@vim.org>
date Sat, 03 Aug 2019 23:00:06 +0200
parents f178127b7255
children 4c7097a980a5
line wrap: on
line diff
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -1,6 +1,7 @@
 " Tests for diff mode
 source shared.vim
 source screendump.vim
+source check.vim
 
 func Test_diff_fold_sync()
   enew!
@@ -748,9 +749,9 @@ func VerifyInternal(buf, dumpfile, extra
 endfunc
 
 func Test_diff_screen()
-  if !CanRunVimInTerminal() || !has('menu')
-    throw 'Skipped: cannot make screendumps and/or menu feature missing'
-  endif
+  CheckScreendump
+  CheckFeature menu
+
   " clean up already existing swap files, just in case
   call delete('.Xfile1.swp')
   call delete('.Xfile2.swp')
@@ -880,9 +881,7 @@ func Test_diff_screen()
 endfunc
 
 func Test_diff_with_cursorline()
-  if !CanRunVimInTerminal()
-    throw 'Skipped: cannot run Vim in a terminal window'
-  endif
+  CheckScreendump
 
   call writefile([
 	\ 'hi CursorLine ctermbg=red ctermfg=white',
@@ -907,12 +906,8 @@ func Test_diff_with_cursorline()
 endfunc
 
 func Test_diff_of_diff()
-  if !CanRunVimInTerminal()
-    throw 'Skipped: cannot run Vim in a terminal window'
-  endif
-  if !has("rightleft")
-    throw 'Skipped: rightleft not supported'
-  endif
+  CheckScreendump
+  CheckFeature rightleft
 
   call writefile([
 	\ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',