summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-03-24 17:16:33 +0100
committerBram Moolenaar <Bram@vim.org>2018-03-24 17:16:33 +0100
commit897e63c4c0623078b5b39e2715b10f456a2453e7 (patch)
tree9d8242cf24536f9b5f2088393fac711110224fe9
parent45d2a64f964238753403017b6d0ef30be88ccf37 (diff)
patch 8.0.1637: no test for term_dumpdiff() options argumentv8.0.1637
Problem: No test for term_dumpdiff() options argument. Solution: Add a test.
-rw-r--r--src/testdir/test_terminal.vim28
-rw-r--r--src/version.c2
2 files changed, 30 insertions, 0 deletions
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 29e2d7b13d..f2fbaf4676 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -995,3 +995,31 @@ func Test_terminal_dumpdiff()
call assert_equal(' bbbbbbbbbbbbbbbbbb ', getline(26)[0:29])
quit
endfunc
+
+func Test_terminal_dumpdiff_options()
+ set laststatus=0
+ call assert_equal(1, winnr('$'))
+ let height = winheight(0)
+ call term_dumpdiff('dumps/Test_popup_command_01.dump', 'dumps/Test_popup_command_02.dump', {'vertical': 1, 'term_cols': 33})
+ call assert_equal(2, winnr('$'))
+ call assert_equal(height, winheight(winnr()))
+ call assert_equal(33, winwidth(winnr()))
+ call assert_equal('dump diff dumps/Test_popup_command_01.dump', bufname('%'))
+ quit
+
+ call assert_equal(1, winnr('$'))
+ let width = winwidth(0)
+ call term_dumpdiff('dumps/Test_popup_command_01.dump', 'dumps/Test_popup_command_02.dump', {'vertical': 0, 'term_rows': 13, 'term_name': 'something else'})
+ call assert_equal(2, winnr('$'))
+ call assert_equal(width, winwidth(winnr()))
+ call assert_equal(13, winheight(winnr()))
+ call assert_equal('something else', bufname('%'))
+ quit
+
+ call assert_equal(1, winnr('$'))
+ call term_dumpdiff('dumps/Test_popup_command_01.dump', 'dumps/Test_popup_command_02.dump', {'curwin': 1})
+ call assert_equal(1, winnr('$'))
+ bwipe
+
+ set laststatus&
+endfunc
diff --git a/src/version.c b/src/version.c
index 71a67ce8f6..0249efbe0f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1637,
+/**/
1636,
/**/
1635,