diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-02-05 20:54:26 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-02-05 20:54:26 +0100 |
commit | 13c724fb3a630257b736a1c91643b396fee917c1 (patch) | |
tree | c4c25c2f543a154d4a20adbf4554e88a592bd73a /src | |
parent | 059b7482a2d9d4cebbf4c01b2b2ea6f1e783cc20 (diff) | |
download | vim-git-13c724fb3a630257b736a1c91643b396fee917c1.tar.gz |
patch 8.0.0310: not enough testing for GUI functionalityv8.0.0310
Problem: Not enough testing for GUI functionality.
Solution: Add tests for v:windowid and getwinpos[xy](). (Kazunobu Kuriyama)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_gui.vim | 18 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index 14c0ca1f4..c5c771680 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -4,6 +4,9 @@ if !has('gui') || ($DISPLAY == "" && !has('gui_running')) finish endif +let s:x11_based_gui = has('gui_athena') || has('gui_motif') + \ || has('gui_gtk2') || has('gui_gnome') || has('gui_gtk3') + " For KDE set a font, empty 'guifont' may cause a hang. func SetUp() if has("gui_kde") @@ -32,10 +35,23 @@ func Test_1_set_secure() call assert_equal(1, has('gui_running')) endfunc +func Test_getwinpos() + call assert_match('Window position: X \d\+, Y \d\+', execute('winpos')) + call assert_true(getwinposx() >= 0) + call assert_true(getwinposy() >= 0) +endfunction + func Test_shell_command() new r !echo hello call assert_equal('hello', substitute(getline(2), '\W', '', 'g')) bwipe! - call assert_true(1, match(execute('winpos'), 'Window position: X \d\+, Y \d\+') >= 0) endfunc + +func Test_windowid_variable() + if s:x11_based_gui || has('win32') + call assert_true(v:windowid > 0) + else + call assert_equal(0, v:windowid) + endif +endfunction diff --git a/src/version.c b/src/version.c index dbe0dcb85..187602cea 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 310, +/**/ 309, /**/ 308, |