# HG changeset patch # User Bram Moolenaar # Date 1548598505 -3600 # Node ID e649df2124618405d3eb54a190c2c74d97978e6b # Parent bd85af35d3e1038421485eadc31321be9d0fc3ad patch 8.1.0832: confirm() is not tested commit https://github.com/vim/vim/commit/2e0500921891e4fec57e97d3c0021aa2d2b4d7ae Author: Bram Moolenaar Date: Sun Jan 27 15:00:36 2019 +0100 patch 8.1.0832: confirm() is not tested Problem: confirm() is not tested. Solution: Add a test. (Dominique Pelle, closes https://github.com/vim/vim/issues/3868) diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -1153,3 +1153,58 @@ func Test_func_exists_on_reload() call delete('Xfuncexists') delfunc ExistingFunction endfunc + +" Test confirm({msg} [, {choices} [, {default} [, {type}]]]) +func Test_confirm() + if !has('unix') || has('gui_running') + return + endif + + call feedkeys('o', 'L') + let a = confirm('Press O to proceed') + call assert_equal(1, a) + + call feedkeys('y', 'L') + let a = confirm('Are you sure?', "&Yes\n&No") + call assert_equal(1, a) + + call feedkeys('n', 'L') + let a = confirm('Are you sure?', "&Yes\n&No") + call assert_equal(2, a) + + " confirm() should return 0 when pressing CTRL-C. + call feedkeys("\", 'L') + let a = confirm('Are you sure?', "&Yes\n&No") + call assert_equal(0, a) + + " requires another character to avoid it being seen as the start of an + " escape sequence. Zero should be harmless. + call feedkeys("\0", 'L') + let a = confirm('Are you sure?', "&Yes\n&No") + call assert_equal(0, a) + + " Default choice is returned when pressing . + call feedkeys("\", 'L') + let a = confirm('Are you sure?', "&Yes\n&No") + call assert_equal(1, a) + + call feedkeys("\", 'L') + let a = confirm('Are you sure?', "&Yes\n&No", 2) + call assert_equal(2, a) + + call feedkeys("\", 'L') + let a = confirm('Are you sure?', "&Yes\n&No", 0) + call assert_equal(0, a) + + " Test with the {type} 4th argument + for type in ['Error', 'Question', 'Info', 'Warning', 'Generic'] + call feedkeys('y', 'L') + let a = confirm('Are you sure?', "&Yes\n&No\n", 1, type) + call assert_equal(1, a) + endfor + + call assert_fails('call confirm([])', 'E730:') + call assert_fails('call confirm("Are you sure?", [])', 'E730:') + call assert_fails('call confirm("Are you sure?", "&Yes\n&No\n", [])', 'E745:') + call assert_fails('call confirm("Are you sure?", "&Yes\n&No\n", 0, [])', 'E730:') +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 832, +/**/ 831, /**/ 830,