To: vim_dev@googlegroups.com Subject: Patch 8.2.0426 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0426 Problem: Some errors were not tested for. Solution: Add tests. (Dominique Pelle, closes #5824) Files: src/testdir/test_buffer.vim, src/testdir/test_options.vim, src/testdir/test_tcl.vim, src/testdir/test_terminal.vim, src/testdir/test_window_cmd.vim *** ../vim-8.2.0425/src/testdir/test_buffer.vim 2020-02-17 21:33:26.266098800 +0100 --- src/testdir/test_buffer.vim 2020-03-22 14:39:17.255828661 +0100 *************** *** 144,149 **** --- 144,150 ---- func Test_bdelete_cmd() %bwipe! call assert_fails('bdelete 5', 'E516:') + call assert_fails('1,1bdelete 1 2', 'E488:') " Deleting a unlisted and unloaded buffer edit Xfile1 *** ../vim-8.2.0425/src/testdir/test_options.vim 2020-03-19 12:38:16.557889484 +0100 --- src/testdir/test_options.vim 2020-03-22 14:39:17.255828661 +0100 *************** *** 255,263 **** call assert_fails('set regexpengine=3', 'E474:') call assert_fails('set history=10001', 'E474:') call assert_fails('set numberwidth=21', 'E474:') ! call assert_fails('set colorcolumn=-a') ! call assert_fails('set colorcolumn=a') ! call assert_fails('set colorcolumn=1,') call assert_fails('set cmdheight=-1', 'E487:') call assert_fails('set cmdwinheight=-1', 'E487:') if has('conceal') --- 255,264 ---- call assert_fails('set regexpengine=3', 'E474:') call assert_fails('set history=10001', 'E474:') call assert_fails('set numberwidth=21', 'E474:') ! call assert_fails('set colorcolumn=-a', 'E474:') ! call assert_fails('set colorcolumn=a', 'E474:') ! call assert_fails('set colorcolumn=1,', 'E474:') ! call assert_fails('set colorcolumn=1;', 'E474:') call assert_fails('set cmdheight=-1', 'E487:') call assert_fails('set cmdwinheight=-1', 'E487:') if has('conceal') *************** *** 293,301 **** --- 294,306 ---- call assert_fails('set guicursor=i-ci,r-cr:h', 'E545:') call assert_fails('set guicursor=i-ci', 'E545:') call assert_fails('set guicursor=x', 'E545:') + call assert_fails('set guicursor=x:', 'E546:') call assert_fails('set guicursor=r-cr:horx', 'E548:') call assert_fails('set guicursor=r-cr:hor0', 'E549:') endif + if has('mouseshape') + call assert_fails('se mouseshape=i-r:x', 'E547:') + endif call assert_fails('set backupext=~ patchmode=~', 'E589:') call assert_fails('set winminheight=10 winheight=9', 'E591:') call assert_fails('set winminwidth=10 winwidth=9', 'E592:') *** ../vim-8.2.0425/src/testdir/test_tcl.vim 2019-09-01 14:36:29.000000000 +0200 --- src/testdir/test_tcl.vim 2020-03-22 14:39:17.255828661 +0100 *************** *** 653,658 **** --- 653,661 ---- " Test exiting current Tcl interpreter and re-creating one. func Test_tcl_exit() + call assert_fails('tcl exit 1 1', 'wrong # args: should be "exit ?returnCode?"') + call assert_fails('tcl exit x', 'expected integer but got "x"') + tcl set foo "foo" call assert_fails('tcl exit 3', 'E572: exit code 3') *** ../vim-8.2.0425/src/testdir/test_terminal.vim 2020-03-19 19:44:29.155344080 +0100 --- src/testdir/test_terminal.vim 2020-03-22 14:39:17.255828661 +0100 *************** *** 2330,2335 **** --- 2330,2339 ---- unlet! g:called_arg endfunc + func Test_terminal_invalid_arg() + call assert_fails('terminal ++xyz', 'E181:') + endfunc + func Test_terminal_in_popup() CheckRunVimInTerminal *** ../vim-8.2.0425/src/testdir/test_window_cmd.vim 2020-03-20 18:20:47.084975607 +0100 --- src/testdir/test_window_cmd.vim 2020-03-22 14:39:17.255828661 +0100 *************** *** 174,179 **** --- 174,208 ---- %bw! endfunc + func Test_window_split_no_room() + " N horizontal windows need >= 2*N + 1 lines: + " - 1 line + 1 status line in each window + " - 1 Ex command line + " + " 2*N + 1 <= &lines + " N <= (lines - 1)/2 + " + " Beyond that number of windows, E36: Not enough room is expected. + let hor_win_count = (&lines - 1)/2 + let hor_split_count = hor_win_count - 1 + for s in range(1, hor_split_count) | split | endfor + call assert_fails('split', 'E36:') + + " N vertical windows need >= 2*(N - 1) + 1 columns: + " - 1 column + 1 separator for each window (except last window) + " - 1 column for the last window which does not have separator + " + " 2*(N - 1) + 1 <= &columns + " 2*N - 1 <= &columns + " N <= (&columns + 1)/2 + let ver_win_count = (&columns + 1)/2 + let ver_split_count = ver_win_count - 1 + for s in range(1, ver_split_count) | vsplit | endfor + call assert_fails('vsplit', 'E36:') + + %bw! + endfunc + func Test_window_preview() CheckFeature quickfix *** ../vim-8.2.0425/src/version.c 2020-03-22 14:08:27.321399669 +0100 --- src/version.c 2020-03-22 14:39:47.931723421 +0100 *************** *** 740,741 **** --- 740,743 ---- { /* Add new patch number below this line */ + /**/ + 426, /**/ -- FATHER: Who are you? PRINCE: I'm ... your son ... FATHER: Not you. LAUNCELOT: I'm ... er ... Sir Launcelot, sir. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@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 ///