Patch 8.2.2604

[Bram Moolenaar]

Patch 8.2.2604
Problem: GUI-specific command line arguments not tested.
Solution: Add tests for several arguments. (Dominique Pellé, closes #7962)
Files: src/testdir/test_startup.vim


*** ../vim-8.2.2603/src/testdir/test_startup.vim 2021-01-11 19:54:38.772073332 +0100
--- src/testdir/test_startup.vim 2021-03-14 16:17:47.227353295 +0100
***************
*** 109,117 ****
endfunc

func Test_help_arg()
! if !has('unix') && has('gui_running')
! throw 'Skipped: does not work with gvim on MS-Windows'
! endif
if RunVim([], [], '--help >Xtestout')
let lines = readfile('Xtestout')
call assert_true(len(lines) > 20)
--- 109,116 ----
endfunc

func Test_help_arg()
! CheckNotMSWindows
!
if RunVim([], [], '--help >Xtestout')
let lines = readfile('Xtestout')
call assert_true(len(lines) > 20)
***************
*** 408,413 ****
--- 407,540 ----
call delete('Xtestout')
endfunc

+ " Test the --echo-wid argument (for GTK GUI only).
+ func Test_echo_wid()
+ CheckCanRunGui
+ CheckFeature gui_gtk
+
+ if RunVim([], [], '-g --echo-wid -cq >Xtest_echo_wid')
+ let lines = readfile('Xtest_echo_wid')
+ call assert_equal(1, len(lines))
+ call assert_match('^WID: \d\+$', lines[0])
+ endif
+
+ call delete('Xtest_echo_wid')
+ endfunction
+
+ " Test the -reverse and +reverse arguments (for GUI only).
+ func Test_reverse()
+ CheckCanRunGui
+ CheckNotMSWindows
+
+ let after =<< trim [CODE]
+ call writefile([&background], "Xtest_reverse")
+ qall
+ [CODE]
+ if RunVim([], after, '-f -g -reverse')
+ let lines = readfile('Xtest_reverse')
+ call assert_equal(['dark'], lines)
+ endif
+ if RunVim([], after, '-f -g +reverse')
+ let lines = readfile('Xtest_reverse')
+ call assert_equal(['light'], lines)
+ endif
+
+ call delete('Xtest_reverse')
+ endfunc
+
+ " Test the -background and -foreground arguments (for GUI only).
+ func Test_background_foreground()
+ CheckCanRunGui
+ CheckNotMSWindows
+
+ " Is there a better way to check the effect of -background & -foreground
+ " other than merely looking at &background (dark or light)?
+ let after =<< trim [CODE]
+ call writefile([&background], "Xtest_fg_bg")
+ qall
+ [CODE]
+ if RunVim([], after, '-f -g -background darkred -foreground yellow')
+ let lines = readfile('Xtest_fg_bg')
+ call assert_equal(['dark'], lines)
+ endif
+ if RunVim([], after, '-f -g -background ivory -foreground darkgreen')
+ let lines = readfile('Xtest_fg_bg')
+ call assert_equal(['light'], lines)
+ endif
+
+ call delete('Xtest_fg_bg')
+ endfunc
+
+ " Test the -font argument (for GUI only).
+ func Test_font()
+ CheckCanRunGui
+ CheckNotMSWindows
+
+ if has('gui_gtk')
+ let font = 'Courier 14'
+ elseif has('gui_motif') || has('gui_athena')
+ let font = '-misc-fixed-bold-*'
+ else
+ throw 'Skipped: test does not set a valid font for this GUI'
+ endif
+
+ let after =<< trim [CODE]
+ call writefile([&guifont], "Xtest_font")
+ qall
+ [CODE]
+
+ if RunVim([], after, '--nofork -g -font "' .. font .. '"')
+ let lines = readfile('Xtest_font')
+ call assert_equal([font], lines)
+ endif
+
+ call delete('Xtest_font')
+ endfunc
+
+ " Test the -geometry argument (for GUI only).
+ func Test_geometry()
+ CheckCanRunGui
+ CheckNotMSWindows
+
+ if has('gui_motif') || has('gui_athena')
+ " FIXME: With GUI Athena or Motif, the value of getwinposx(),
+ " getwinposy() and getwinpos() do not match exactly the
+ " value given in -geometry. Why?
+ " So only check &columns and &lines for those GUIs.
+ let after =<< trim [CODE]
+ call writefile([&columns, &lines], "Xtest_geometry")
+ qall
+ [CODE]
+ if RunVim([], after, '-f -g -geometry 31x13+41+43')
+ let lines = readfile('Xtest_geometry')
+ call assert_equal(['31', '13'], lines)
+ endif
+ else
+ let after =<< trim [CODE]
+ call writefile([&columns, &lines, getwinposx(), getwinposy(), string(getwinpos())], "Xtest_geometry")
+ qall
+ [CODE]
+ if RunVim([], after, '-f -g -geometry 31x13+41+43')
+ let lines = readfile('Xtest_geometry')
+ call assert_equal(['31', '13', '41', '43', '[41, 43]'], lines)
+ endif
+ endif
+
+ call delete('Xtest_geometry')
+ endfunc
+
+ " Test the -iconic argument (for GUI only).
+ func Test_iconic()
+ CheckCanRunGui
+ CheckNotMSWindows
+
+ call RunVim([], [], '-f -g -iconic -cq')
+
+ " TODO: currently only start vim iconified, but does not
+ " check that vim is iconified. How could this be checked?
+ endfunc
+
+
func Test_invalid_args()
" must be able to get the output of Vim.
CheckUnix
***************
*** 1042,1057 ****
\ 'vimdiff', 'gvimdiff']

for progname in prognames
! if empty($DISPLAY)
! if progname =~# 'g'
! " Can't run gvim, gview (etc.) if $DISPLAY is not setup.
! continue
! endif
! if has('gui') && (progname ==# 'evim' || progname ==# 'eview')
! " evim or eview will start the GUI if there is gui support.
! " So don't try to start them either if $DISPLAY is not setup.
! continue
! endif
endif

exe 'silent !ln -s -f ' ..exepath(GetVimProg()) .. ' Xprogname/' .. progname
--- 1169,1179 ----
\ 'vimdiff', 'gvimdiff']

for progname in prognames
! let run_with_gui = (progname =~# 'g') || (has('gui') && (progname ==# 'evim' || progname ==# 'eview'))
!
! if empty($DISPLAY) && run_with_gui
! " Can't run gvim, gview (etc.) if $DISPLAY is not setup.
! continue
endif

exe 'silent !ln -s -f ' ..exepath(GetVimProg()) .. ' Xprogname/' .. progname
***************
*** 1066,1072 ****
if progname =~# 'g' && !has('gui')
call assert_equal("E25: GUI cannot be used: Not enabled at compile time\n", stdout_stderr, progname)
else
! call assert_equal('', stdout_stderr, progname)
call assert_equal(expectations[progname], readfile('Xprogname_out'), progname)
endif

--- 1188,1202 ----
if progname =~# 'g' && !has('gui')
call assert_equal("E25: GUI cannot be used: Not enabled at compile time\n", stdout_stderr, progname)
else
! " GUI motif can output some warnings like this:
! " Warning:
! " Name: subMenu
! " Class: XmCascadeButton
! " Illegal mnemonic character; Could not convert X KEYSYM to a keycode
! " So don't check that stderr is empty with GUI Motif.
! if run_with_gui && !has('gui_motif')
! call assert_equal('', stdout_stderr, progname)
! endif
call assert_equal(expectations[progname], readfile('Xprogname_out'), progname)
endif

*** ../vim-8.2.2603/src/version.c 2021-03-14 13:21:31.789065156 +0100
--- src/version.c 2021-03-14 16:18:45.603223556 +0100
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2604,
/**/

--
The acknowledged parents of reengineering are Michael Hammer and James Champy.
When I say they're the "parents" I don't mean they had sex - and I apologize
for making you think about it. I mean they wrote the best-selling business
book _Reengineering the Corporation_, which was published in 1993.
Businesses flocked to reengineering like frat boys to a drunken
cheerleader. (This analogy wasn't necessary, but I'm trying to get my mind
off that Hammer and Champy thing.)
(Scott Adams - The Dilbert principle)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///