From b10d822a77ebc8111029adb3176f8c086026c303 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 15 Aug 2018 21:05:27 -0400 Subject: vim-patch:8.1.0186: test for getwininfo() fails in GUI Problem: Test for getwininfo() fails in GUI. Solution: Account for missing tabline. https://github.com/vim/vim/commit/44a693a1bdfe987edb649677c94c214f94b2aada --- src/nvim/testdir/test_bufwintabinfo.vim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nvim/testdir/test_bufwintabinfo.vim b/src/nvim/testdir/test_bufwintabinfo.vim index 478f7ac9bc..a6b4524cc0 100644 --- a/src/nvim/testdir/test_bufwintabinfo.vim +++ b/src/nvim/testdir/test_bufwintabinfo.vim @@ -46,15 +46,16 @@ function Test_getbufwintabinfo() call assert_equal(5, len(winlist)) call assert_equal(winwidth(1), winlist[0].width) call assert_equal(0, winlist[0].wincol) - call assert_equal(1, winlist[0].winrow) " tabline adds one + let tablineheight = winlist[0].winrow == 1 ? 1 : 0 + call assert_equal(tablineheight, winlist[0].winrow) " tabline adds one call assert_equal(winbufnr(2), winlist[1].bufnr) call assert_equal(winheight(2), winlist[1].height) call assert_equal(0, winlist[1].wincol) - call assert_equal(winheight(1) + 2, winlist[1].winrow) + call assert_equal(tablineheight + winheight(1) + 1, winlist[1].winrow) call assert_equal(1, winlist[2].winnr) - call assert_equal(1, winlist[2].winrow) + call assert_equal(tablineheight, winlist[2].winrow) call assert_equal(0, winlist[2].wincol) call assert_equal(winlist[2].width + 1, winlist[3].wincol) -- cgit