diff src/testdir/screendump.vim @ 13541:296d02b0637f v8.0.1644

patch 8.0.1644: terminal API tests still fail commit https://github.com/vim/vim/commit/cf67a509e93167f14c892301e13de14636cedc61 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 25 20:31:32 2018 +0200 patch 8.0.1644: terminal API tests still fail Problem: Terminal API tests still fail. Solution: Explicitly set 'title' in the terminal job. (Ozaki Kiichi, closes #2750)
author Christian Brabandt <cb@256bit.org>
date Sun, 25 Mar 2018 20:45:06 +0200
parents 3fa880445c99
children af68603e213d
line wrap: on
line diff
--- a/src/testdir/screendump.vim
+++ b/src/testdir/screendump.vim
@@ -24,7 +24,9 @@ source shared.vim
 " By default uses a size of 20 lines and 75 columns.
 " Returns the buffer number of the terminal.
 "
-" Options is a dictionary (not used yet).
+" Options is a dictionary, these items are recognized:
+" "rows" - height of the terminal window (max. 20)
+" "cols" - width of the terminal window (max. 78)
 func RunVimInTerminal(arguments, options)
   " If Vim doesn't exit a swap file remains, causing other tests to fail.
   " Remove it here.
@@ -47,17 +49,15 @@ func RunVimInTerminal(arguments, options
   set t_Co=256 background=light
   hi Normal ctermfg=NONE ctermbg=NONE
 
-  " Make the window 20 lines high, unless told otherwise.
-  let rows = 20
-  if has_key(a:options, 'rows')
-    let rows = a:options['rows']
-  endif
+  " Make the window 20 lines high and 75 columns, unless told otherwise.
+  let rows = get(a:options, 'rows', 20)
+  let cols = get(a:options, 'cols', 75)
 
   let cmd = GetVimCommandClean()
   " Add -v to have gvim run in the terminal (if possible)
   let cmd .= ' -v ' . a:arguments
-  let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': 75})
-  call assert_equal([rows, 75], term_getsize(buf))
+  let buf = term_start(cmd, {'curwin': 1, 'term_rows': rows, 'term_cols': cols})
+  call assert_equal([rows, cols], term_getsize(buf))
 
   return buf
 endfunc