vim-patch:8.2.0301: insufficient testing for exception handling (#20016)

Problem:    Insufficient testing for exception handling and the "attention"
            prompt.
Solution:   Add test cases. (Yegappan Lakshmanan, closes vim/vim#5681)
b654103ad1

Fix memory leak from last char_u refactor.
This commit is contained in:
zeertzjq 2022-08-31 07:24:16 +08:00 committed by GitHub
parent 518b5c65b0
commit 5ff2ea6687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 171 additions and 8 deletions

View File

@ -3111,8 +3111,7 @@ char *get_return_cmd(void *rettv)
char *tofree = NULL;
if (rettv != NULL) {
tofree = encode_tv2echo((typval_T *)rettv, NULL);
s = encode_tv2echo((typval_T *)rettv, NULL);
tofree = s = encode_tv2echo((typval_T *)rettv, NULL);
}
if (s == NULL) {
s = "";

View File

@ -2,6 +2,7 @@
source check.vim
source shared.vim
source term_util.vim
func s:swapname()
return trim(execute('swapname'))

View File

@ -2027,16 +2027,179 @@ func Test_try_catch_verbose()
endtry
redir END
let expected = [
\ 'Exception thrown: Vim(echo):E121: Undefined variable: i',
\ '',
\ 'Exception caught: Vim(echo):E121: Undefined variable: i',
\ '',
\ 'Exception finished: Vim(echo):E121: Undefined variable: i'
\ ]
\ 'Exception thrown: Vim(echo):E121: Undefined variable: i', '',
\ 'Exception caught: Vim(echo):E121: Undefined variable: i', '',
\ 'Exception finished: Vim(echo):E121: Undefined variable: i']
call assert_equal(expected, split(msg, "\n"))
" Test for verbose messages displayed when an exception is discarded
redir => msg
try
try
throw 'abc'
finally
throw 'xyz'
endtry
catch
endtry
redir END
let expected = [
\ 'Exception thrown: abc', '',
\ 'Exception made pending: abc', '',
\ 'Exception thrown: xyz', '',
\ 'Exception discarded: abc', '',
\ 'Exception caught: xyz', '',
\ 'Exception finished: xyz']
call assert_equal(expected, split(msg, "\n"))
" Test for messages displayed when :throw is resumed after :finally
redir => msg
try
try
throw 'abc'
finally
endtry
catch
endtry
redir END
let expected = [
\ 'Exception thrown: abc', '',
\ 'Exception made pending: abc', '',
\ 'Exception resumed: abc', '',
\ 'Exception caught: abc', '',
\ 'Exception finished: abc']
call assert_equal(expected, split(msg, "\n"))
" Test for messages displayed when :break is resumed after :finally
redir => msg
for i in range(1)
try
break
finally
endtry
endfor
redir END
let expected = [':break made pending', '', ':break resumed']
call assert_equal(expected, split(msg, "\n"))
" Test for messages displayed when :continue is resumed after :finally
redir => msg
for i in range(1)
try
continue
finally
endtry
endfor
redir END
let expected = [':continue made pending', '', ':continue resumed']
call assert_equal(expected, split(msg, "\n"))
" Test for messages displayed when :return is resumed after :finally
func Xtest()
try
return 'vim'
finally
endtry
endfunc
redir => msg
call Xtest()
redir END
let expected = [
\ 'calling Xtest()', '',
\ ':return vim made pending', '',
\ ':return vim resumed', '',
\ 'Xtest returning ''vim''', '',
\ 'continuing in Test_try_catch_verbose']
call assert_equal(expected, split(msg, "\n"))
delfunc Xtest
" Test for messages displayed when :finish is resumed after :finally
call writefile(['try', 'finish', 'finally', 'endtry'], 'Xscript')
redir => msg
source Xscript
redir END
let expected = [
\ ':finish made pending', '',
\ ':finish resumed', '',
\ 'finished sourcing Xscript',
\ 'continuing in Test_try_catch_verbose']
call assert_equal(expected, split(msg, "\n")[1:])
call delete('Xscript')
" Test for messages displayed when a pending :continue is discarded by an
" exception in a finally handler
redir => msg
try
for i in range(1)
try
continue
finally
throw 'abc'
endtry
endfor
catch
endtry
redir END
let expected = [
\ ':continue made pending', '',
\ 'Exception thrown: abc', '',
\ ':continue discarded', '',
\ 'Exception caught: abc', '',
\ 'Exception finished: abc']
call assert_equal(expected, split(msg, "\n"))
set verbose&
endfunc
" Test for throwing an exception from a BufEnter autocmd {{{1
func Test_BufEnter_exception()
augroup bufenter_exception
au!
autocmd BufEnter Xfile1 throw 'abc'
augroup END
let caught_abc = 0
try
sp Xfile1
catch /^abc/
let caught_abc = 1
endtry
call assert_equal(1, caught_abc)
call assert_equal(1, winnr('$'))
augroup bufenter_exception
au!
augroup END
augroup! bufenter_exception
%bwipe!
" Test for recursively throwing exceptions in autocmds
augroup bufenter_exception
au!
autocmd BufEnter Xfile1 throw 'bufenter'
autocmd BufLeave Xfile1 throw 'bufleave'
augroup END
let ex_count = 0
try
try
sp Xfile1
catch /^bufenter/
let ex_count += 1
endtry
catch /^bufleave/
let ex_count += 10
endtry
call assert_equal(10, ex_count)
call assert_equal(2, winnr('$'))
augroup bufenter_exception
au!
augroup END
augroup! bufenter_exception
%bwipe!
endfunc
" Test for using throw in a called function with following error {{{1
func Test_user_command_throw_in_function_call()
let lines =<< trim END