summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/testing.txt19
-rw-r--r--src/evalvars.c9
-rw-r--r--src/globals.h4
-rw-r--r--src/if_cscope.c1
-rw-r--r--src/message.c3
-rw-r--r--src/testdir/test_autocmd.vim12
-rw-r--r--src/testdir/test_buffer.vim4
-rw-r--r--src/testdir/test_cd.vim4
-rw-r--r--src/testdir/test_channel.vim14
-rw-r--r--src/testdir/test_clientserver.vim6
-rw-r--r--src/testdir/test_cmdline.vim6
-rw-r--r--src/testdir/test_cpoptions.vim2
-rw-r--r--src/testdir/test_cscope.vim2
-rw-r--r--src/testdir/test_excmd.vim4
-rw-r--r--src/testdir/test_expr.vim2
-rw-r--r--src/testdir/test_functions.vim10
-rw-r--r--src/testdir/test_global.vim2
-rw-r--r--src/testdir/test_json.vim40
-rw-r--r--src/testdir/test_let.vim2
-rw-r--r--src/testdir/test_listdict.vim6
-rw-r--r--src/testdir/test_listener.vim4
-rw-r--r--src/testdir/test_match.vim2
-rw-r--r--src/testdir/test_menu.vim2
-rw-r--r--src/testdir/test_method.vim4
-rw-r--r--src/testdir/test_normal.vim2
-rw-r--r--src/testdir/test_popup.vim2
-rw-r--r--src/testdir/test_python2.vim2
-rw-r--r--src/testdir/test_python3.vim12
-rw-r--r--src/testdir/test_quickfix.vim6
-rw-r--r--src/testdir/test_random.vim10
-rw-r--r--src/testdir/test_regexp_latin.vim2
-rw-r--r--src/testdir/test_search.vim8
-rw-r--r--src/testdir/test_signs.vim6
-rw-r--r--src/testdir/test_spell.vim2
-rw-r--r--src/testdir/test_substitute.vim8
-rw-r--r--src/testdir/test_syntax.vim2
-rw-r--r--src/testdir/test_tagfunc.vim2
-rw-r--r--src/testdir/test_tagjump.vim4
-rw-r--r--src/testdir/test_taglist.vim2
-rw-r--r--src/testdir/test_terminal.vim24
-rw-r--r--src/testdir/test_textprop.vim8
-rw-r--r--src/testdir/test_trycatch.vim2
-rw-r--r--src/testdir/test_utf8.vim2
-rw-r--r--src/testdir/test_vim9_disassemble.vim4
-rw-r--r--src/testdir/test_vim9_func.vim2
-rw-r--r--src/testdir/test_vim9_script.vim6
-rw-r--r--src/testdir/test_viminfo.vim6
-rw-r--r--src/testdir/test_winbuf_close.vim2
-rw-r--r--src/testdir/test_window_cmd.vim2
-rw-r--r--src/testdir/test_writefile.vim2
-rw-r--r--src/testing.c59
-rw-r--r--src/version.c2
-rw-r--r--src/vim9compile.c26
53 files changed, 227 insertions, 154 deletions
diff --git a/runtime/doc/testing.txt b/runtime/doc/testing.txt
index b7825b90f9..53ed0818e4 100644
--- a/runtime/doc/testing.txt
+++ b/runtime/doc/testing.txt
@@ -295,8 +295,23 @@ assert_exception({error} [, {msg}]) *assert_exception()*
assert_fails({cmd} [, {error} [, {msg}]]) *assert_fails()*
Run {cmd} and add an error message to |v:errors| if it does
- NOT produce an error. Also see |assert-return|.
- When {error} is given it must match in |v:errmsg|.
+ NOT produce an error or when {error} is not found in the
+ error message. Also see |assert-return|.
+
+ When {error} is a string it must be found literally in the
+ first reported error. Most often this will be the error code,
+ including the colon, e.g. "E123:". >
+ assert_fails('bad cmd', 'E987:')
+<
+ When {error} is a |List| with one or two strings, these are
+ used as patterns. The first pattern is matched against the
+ first reported error: >
+ assert_fails('cmd', ['E987:.*expected bool'])
+< The second pattern, if present, is matched against the last
+ reported error. To only match the last error use an empty
+ string for the first error: >
+ assert_fails('cmd', ['', 'E987:'])
+<
Note that beeping is not considered an error, and some failing
commands only beep. Use |assert_beeps()| for those.
diff --git a/src/evalvars.c b/src/evalvars.c
index 9cd2ec2c89..70660397c7 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -3388,7 +3388,7 @@ static char_u *redir_varname = NULL;
int
var_redir_start(char_u *name, int append)
{
- int save_emsg;
+ int called_emsg_before;
int err;
typval_T tv;
@@ -3432,8 +3432,7 @@ var_redir_start(char_u *name, int append)
// check if we can write to the variable: set it to or append an empty
// string
- save_emsg = did_emsg;
- did_emsg = FALSE;
+ called_emsg_before = called_emsg;
tv.v_type = VAR_STRING;
tv.vval.v_string = (char_u *)"";
if (append)
@@ -3441,9 +3440,7 @@ var_redir_start(char_u *name, int append)
else
set_var_lval(redir_lval, redir_endp, &tv, TRUE, 0, (char_u *)"=");
clear_lval(redir_lval);
- err = did_emsg;
- did_emsg |= save_emsg;
- if (err)
+ if (called_emsg > called_emsg_before)
{
redir_endp = NULL; // don't store a value, only cleanup
var_redir_stop();
diff --git a/src/globals.h b/src/globals.h
index 3d40cc1a7b..5e2306baba 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -220,6 +220,10 @@ EXTERN int emsg_skip INIT(= 0); // don't display errors for
// expression that is skipped
EXTERN int emsg_severe INIT(= FALSE); // use message of next of several
// emsg() calls for throw
+// used by assert_fails()
+EXTERN int emsg_assert_fails_used INIT(= FALSE);
+EXTERN char_u *emsg_assert_fails_msg INIT(= NULL);
+
EXTERN int did_endif INIT(= FALSE); // just had ":endif"
#endif
EXTERN int did_emsg; // set by emsg() when the message
diff --git a/src/if_cscope.c b/src/if_cscope.c
index 89c851b2a1..0e6f5ae30f 100644
--- a/src/if_cscope.c
+++ b/src/if_cscope.c
@@ -2152,7 +2152,6 @@ cs_read_prompt(int i)
ch = getc(csinfo[i].fr_fp);
if (ch == EOF)
{
- PERROR("cs_read_prompt EOF");
if (buf != NULL && buf[0] != NUL)
(void)semsg(cs_emsg, buf);
else if (p_csverbose)
diff --git a/src/message.c b/src/message.c
index a26a63798b..76ec456795 100644
--- a/src/message.c
+++ b/src/message.c
@@ -654,6 +654,9 @@ emsg_core(char_u *s)
return TRUE;
}
+ if (emsg_assert_fails_used && emsg_assert_fails_msg == NULL)
+ emsg_assert_fails_msg = vim_strsave(s);
+
// set "v:errmsg", also when using ":silent! cmd"
set_vim_var_string(VV_ERRMSG, s, -1);
#endif
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 446d22bd71..c167ed951b 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -168,9 +168,7 @@ func Test_autocmd_bufunload_avoiding_SEGV_01()
exe 'autocmd BufUnload <buffer> ' . (lastbuf + 1) . 'bwipeout!'
augroup END
- " Todo: check for E937 generated first
- " call assert_fails('edit bb.txt', 'E937:')
- call assert_fails('edit bb.txt', 'E517:')
+ call assert_fails('edit bb.txt', ['E937:', 'E517:'])
autocmd! test_autocmd_bufunload
augroup! test_autocmd_bufunload
@@ -1745,9 +1743,7 @@ endfunc
func Test_nocatch_wipe_all_buffers()
" Real nasty autocommand: wipe all buffers on any event.
au * * bwipe *
- " Get E93 first?
- " call assert_fails('next x', 'E93:')
- call assert_fails('next x', 'E517:')
+ call assert_fails('next x', ['E94:', 'E517:'])
bwipe
au!
endfunc
@@ -1756,7 +1752,7 @@ func Test_nocatch_wipe_dummy_buffer()
if has('quickfix')
" Nasty autocommand: wipe buffer on any event.
au * x bwipe
- call assert_fails('lv½ /x', 'E480')
+ call assert_fails('lv½ /x', 'E937')
au!
endif
endfunc
@@ -2570,7 +2566,7 @@ func Test_BufDelete_changebuf()
augroup END
let save_cpo = &cpo
set cpo+=f
- call assert_fails('r Xfile', 'E484:')
+ call assert_fails('r Xfile', ['E812:', 'E484:'])
call assert_equal('somefile', @%)
let &cpo = save_cpo
augroup TestAuCmd
diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim
index 5981e247ac..c8f6c5a696 100644
--- a/src/testdir/test_buffer.vim
+++ b/src/testdir/test_buffer.vim
@@ -76,7 +76,7 @@ func Test_bunload_with_offset()
let caught_E90 = 1
endtry
call assert_equal(1, caught_E90)
- call assert_fails('$bunload', 'E515:')
+ call assert_fails('$bunload', 'E90:')
endfunc
" Test for :buffer, :bnext, :bprevious, :brewind, :blast and :bmodified
@@ -278,7 +278,7 @@ func Test_goto_buf_with_confirm()
call assert_equal(1, &modified)
call assert_equal('', @%)
call feedkeys('y', 'L')
- call assert_fails('confirm b Xfile', 'E37:')
+ call assert_fails('confirm b Xfile', ['', 'E37:'])
call assert_equal(1, &modified)
call assert_equal('', @%)
call feedkeys('n', 'L')
diff --git a/src/testdir/test_cd.vim b/src/testdir/test_cd.vim
index f43f27c048..bd6e3d9a53 100644
--- a/src/testdir/test_cd.vim
+++ b/src/testdir/test_cd.vim
@@ -4,7 +4,7 @@ source shared.vim
func Test_cd_large_path()
" This used to crash with a heap write overflow.
- call assert_fails('cd ' . repeat('x', 5000), 'E472:')
+ call assert_fails('cd ' . repeat('x', 5000), 'E344:')
endfunc
func Test_cd_up_and_down()
@@ -93,7 +93,7 @@ func Test_chdir_func()
call assert_equal('testdir', fnamemodify(getcwd(1, 1), ':t'))
" Error case
- call assert_fails("call chdir('dir-abcd')", 'E472:')
+ call assert_fails("call chdir('dir-abcd')", 'E344:')
silent! let d = chdir("dir_abcd")
call assert_equal("", d)
" Should not crash
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 85312ae733..ae7e3014cf 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -559,7 +559,7 @@ func Test_raw_pipe()
call assert_equal(1, found)
call assert_fails("call job_stop('abc')", 'E475:')
- call assert_fails("call job_stop(job, [])", 'E474:')
+ call assert_fails("call job_stop(job, [])", 'E730:')
call assert_fails("call job_stop(test_null_job())", 'E916:')
" Try to use the job and channel where a number is expected. This is not
@@ -1641,15 +1641,15 @@ func Test_job_start_fails()
call assert_fails("call job_start('ls', {'in_top' : -1})", 'E475:')
call assert_fails("call job_start('ls', {'in_bot' : -1})", 'E475:')
call assert_fails("call job_start('ls', {'channel' : -1})", 'E475:')
- call assert_fails("call job_start('ls', {'callback' : -1})", 'E475:')
- call assert_fails("call job_start('ls', {'out_cb' : -1})", 'E475:')
- call assert_fails("call job_start('ls', {'err_cb' : -1})", 'E475:')
- call assert_fails("call job_start('ls', {'close_cb' : -1})", 'E475:')
- call assert_fails("call job_start('ls', {'exit_cb' : -1})", 'E475:')
+ call assert_fails("call job_start('ls', {'callback' : -1})", 'E921:')
+ call assert_fails("call job_start('ls', {'out_cb' : -1})", 'E921:')
+ call assert_fails("call job_start('ls', {'err_cb' : -1})", 'E921:')
+ call assert_fails("call job_start('ls', {'close_cb' : -1})", 'E921:')
+ call assert_fails("call job_start('ls', {'exit_cb' : -1})", 'E921:')
call assert_fails("call job_start('ls', {'term_name' : []})", 'E475:')
call assert_fails("call job_start('ls', {'term_finish' : 'run'})", 'E475:')
call assert_fails("call job_start('ls', {'term_api' : []})", 'E475:')
- call assert_fails("call job_start('ls', {'stoponexit' : []})", 'E475:')
+ call assert_fails("call job_start('ls', {'stoponexit' : []})", 'E730:')
call assert_fails("call job_start('ls', {'in_io' : 'file'})", 'E920:')
call assert_fails("call job_start('ls', {'out_io' : 'file'})", 'E920:')
call assert_fails("call job_start('ls', {'err_io' : 'file'})", 'E920:')
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 152a2e1772..eb9fcb800e 100644
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -84,7 +84,7 @@ func Test_client_server()
call remote_send(v:servername, ":let g:testvar2 = 75\<CR>")
call feedkeys('', 'x')
call assert_equal(75, g:testvar2)
- call assert_fails('let v = remote_expr(v:servername, "/2")', 'E449:')
+ call assert_fails('let v = remote_expr(v:servername, "/2")', ['E15:.*/2'])
call remote_send(name, ":call server2client(expand('<client>'), 'got it')\<CR>", 'g:myserverid')
call assert_equal('got it', g:myserverid->remote_read(2))
@@ -166,8 +166,8 @@ func Test_client_server()
call assert_fails('call remote_startserver([])', 'E730:')
call assert_fails("let x = remote_peek([])", 'E730:')
- call assert_fails("let x = remote_read('vim10')", 'E277:')
- call assert_fails("call server2client('abc', 'xyz')", 'E258:')
+ call assert_fails("let x = remote_read('vim10')", ['E573:.*vim10'])
+ call assert_fails("call server2client('abc', 'xyz')", ['E573:.*abc'])
endfunc
" Uncomment this line to get a debugging log
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index eb213f1976..539b782f31 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -855,7 +855,7 @@ func Test_cmdline_search_range()
call assert_equal('B', getline(2))
let @/ = 'apple'
- call assert_fails('\/print', 'E486:')
+ call assert_fails('\/print', ['E486:.*apple'])
bwipe!
endfunc
@@ -972,7 +972,7 @@ func Test_verbosefile()
call assert_match("foo\nbar", join(log, "\n"))
call delete('Xlog')
call mkdir('Xdir')
- call assert_fails('set verbosefile=Xdir', 'E474:')
+ call assert_fails('set verbosefile=Xdir', ['E484:.*Xdir', 'E474:'])
call delete('Xdir', 'd')
endfunc
@@ -1208,7 +1208,7 @@ func Test_cmdwin_jump_to_win()
call assert_fails('call feedkeys("q:\<C-W>\<C-W>\<CR>", "xt")', 'E11:')
new
set modified
- call assert_fails('call feedkeys("q/:qall\<CR>", "xt")', 'E162:')
+ call assert_fails('call feedkeys("q/:qall\<CR>", "xt")', ['E37:', 'E162:'])
close!
call feedkeys("q/:close\<CR>", "xt")
call assert_equal(1, winnr('$'))
diff --git a/src/testdir/test_cpoptions.vim b/src/testdir/test_cpoptions.vim
index ce4e00deb3..02cadf4bbc 100644
--- a/src/testdir/test_cpoptions.vim
+++ b/src/testdir/test_cpoptions.vim
@@ -104,7 +104,7 @@ func Test_cpo_C()
source Xfile
call assert_equal([1, 2], g:l)
set cpo+=C
- call assert_fails('source Xfile', 'E10:')
+ call assert_fails('source Xfile', ['E697:', 'E10:'])
call delete('Xfile')
let &cpo = save_cpo
endfunc
diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
index 9d12e2f602..f4d4208492 100644
--- a/src/testdir/test_cscope.vim
+++ b/src/testdir/test_cscope.vim
@@ -189,7 +189,7 @@ func Test_cscopeWithCscopeConnections()
" Test: 'cst' option
set nocst
- call assert_fails('tag TEST_COUNT', 'E426:')
+ call assert_fails('tag TEST_COUNT', 'E433:')
set cst
let a = execute('tag TEST_COUNT')
call assert_match('(1 of 1): <<TEST_COUNT>> #define TEST_COUNT 50000', a)
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index 2c693e21d4..150e258ac7 100644
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -335,8 +335,8 @@ func Test_redir_cmd()
call assert_fails('redir abc', 'E475:')
call assert_fails('redir => 1abc', 'E474:')
call assert_fails('redir => a b', 'E488:')
- call assert_fails('redir => abc[1]', 'E474:')
- let b=0zFF
+ call assert_fails('redir => abc[1]', 'E121:')
+ let b = 0zFF
call assert_fails('redir =>> b', 'E734:')
unlet b
diff --git a/src/testdir/test_expr.vim b/src/testdir/test_expr.vim
index c5dd1f37c7..b13154304c 100644
--- a/src/testdir/test_expr.vim
+++ b/src/testdir/test_expr.vim
@@ -478,7 +478,7 @@ func Test_setmatches()
endif
eval set->setmatches()
call assert_equal(exp, getmatches())
- call assert_fails('let m = setmatches([], [])', 'E957:')
+ call assert_fails('let m = setmatches([], [])', 'E745:')
endfunc
func Test_empty_concatenate()
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 1c463f0722..9aa830b2f5 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -224,7 +224,7 @@ func Test_str2nr()
if has('float')
call assert_fails('call str2nr(1.2)', 'E806:')
endif
- call assert_fails('call str2nr(10, [])', 'E474:')
+ call assert_fails('call str2nr(10, [])', 'E745:')
endfunc
func Test_strftime()
@@ -1702,11 +1702,11 @@ func Test_libcall_libcallnr()
call assert_equal(4, 'abcd'->libcallnr(libc, 'strlen'))
call assert_equal(char2nr('A'), char2nr('a')->libcallnr(libc, 'toupper'))
- call assert_fails("call libcall(libc, 'Xdoesnotexist_', '')", 'E364:')
- call assert_fails("call libcallnr(libc, 'Xdoesnotexist_', '')", 'E364:')
+ call assert_fails("call libcall(libc, 'Xdoesnotexist_', '')", ['', 'E364:'])
+ call assert_fails("call libcallnr(libc, 'Xdoesnotexist_', '')", ['', 'E364:'])
- call assert_fails("call libcall('Xdoesnotexist_', 'getenv', 'HOME')", 'E364:')
- call assert_fails("call libcallnr('Xdoesnotexist_', 'strlen', 'abcd')", 'E364:')
+ call assert_fails("call libcall('Xdoesnotexist_', 'getenv', 'HOME')", ['', 'E364:'])
+ call assert_fails("call libcallnr('Xdoesnotexist_', 'strlen', 'abcd')", ['', 'E364:'])
endfunc
sandbox function Fsandbox()
diff --git a/src/testdir/test_global.vim b/src/testdir/test_global.vim
index 38dc082dab..1e79ed1729 100644
--- a/src/testdir/test_global.vim
+++ b/src/testdir/test_global.vim
@@ -36,7 +36,7 @@ endfunc
func Test_global_error()
call assert_fails('g\\a', 'E10:')
call assert_fails('g', 'E148:')
- call assert_fails('g/\(/y', 'E476:')
+ call assert_fails('g/\(/y', 'E54:')
endfunc
" Test for printing lines using :g with different search patterns
diff --git a/src/testdir/test_json.vim b/src/testdir/test_json.vim
index 86c47ae9dc..c3b4382bd7 100644
--- a/src/testdir/test_json.vim
+++ b/src/testdir/test_json.vim
@@ -181,7 +181,7 @@ func Test_json_decode()
call assert_fails('call json_decode("{\"n\",1}")', "E491:")
call assert_fails('call json_decode("{-}")', "E491:")
if has('float')
- call assert_fails('call json_decode("{3.14:1}")', "E474:")
+ call assert_fails('call json_decode("{3.14:1}")', "E806:")
endif
call assert_fails('call json_decode("[foobar]")', "E491:")
@@ -292,25 +292,25 @@ func Test_js_decode()
call assert_equal({'n': 1}, js_decode('{"n":1,}'))
call assert_equal({'n': '1'}, js_decode("{'n':'1',}"))
- call assert_fails('call js_decode("\"")', "E474:")
- call assert_fails('call js_decode("blah")', "E474:")
- call assert_fails('call js_decode("true blah")', "E474:")
- call assert_fails('call js_decode("<foobar>")', "E474:")
-
- call assert_fails('call js_decode("{")', "E474:")
- call assert_fails('call js_decode("{foobar}")', "E474:")
- call assert_fails('call js_decode("{\"n\",")', "E474:")
- call assert_fails('call js_decode("{\"n\":")', "E474:")
- call assert_fails('call js_decode("{\"n\":1")', "E474:")
- call assert_fails('call js_decode("{\"n\":1,")', "E474:")
- call assert_fails('call js_decode("{\"n\",1}")', "E474:")
- call assert_fails('call js_decode("{-}")', "E474:")
-
- call assert_fails('call js_decode("[foobar]")', "E474:")
- call assert_fails('call js_decode("[")', "E474:")
- call assert_fails('call js_decode("[1")', "E474:")
- call assert_fails('call js_decode("[1,")', "E474:")
- call assert_fails('call js_decode("[1 2]")', "E474:")
+ call assert_fails('call js_decode("\"")', "E491:")
+ call assert_fails('call js_decode("blah")', "E491:")
+ call assert_fails('call js_decode("true blah")', "E488:")
+ call assert_fails('call js_decode("<foobar>")', "E491:")
+
+ call assert_fails('call js_decode("{")', "E491:")
+ call assert_fails('call js_decode("{foobar}")', "E491:")
+ call assert_fails('call js_decode("{\"n\",")', "E491:")
+ call assert_fails('call js_decode("{\"n\":")', "E491:")
+ call assert_fails('call js_decode("{\"n\":1")', "E491:")
+ call assert_fails('call js_decode("{\"n\":1,")', "E491:")
+ call assert_fails('call js_decode("{\"n\",1}")', "E491:")
+ call assert_fails('call js_decode("{-}")', "E491:")
+
+ call assert_fails('call js_decode("[foobar]")', "E491:")
+ call assert_fails('call js_decode("[")', "E491:")
+ call assert_fails('call js_decode("[1")', "E491:")
+ call assert_fails('call js_decode("[1,")', "E491:")
+ call assert_fails('call js_decode("[1 2]")', "E491:")
call assert_equal(s:varl5, js_decode(s:jsl5))
endfunc
diff --git a/src/testdir/test_let.vim b/src/testdir/test_let.vim
index f135a2f02d..404fe15754 100644
--- a/src/testdir/test_let.vim
+++ b/src/testdir/test_let.vim
@@ -279,7 +279,7 @@ func Test_let_errors()
let l = [1, 2, 3]
call assert_fails('let l[:] = 5', 'E709:')
- call assert_fails('let x:lnum=5', 'E488:')
+ call assert_fails('let x:lnum=5', ['E121:', 'E488:'])
call assert_fails('let v:=5', 'E461:')
call assert_fails('let [a]', 'E474:')
call assert_fails('let [a, b] = [', 'E697:')
diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim
index 8a8d353289..b064846993 100644
--- a/src/testdir/test_listdict.vim
+++ b/src/testdir/test_listdict.vim
@@ -674,10 +674,10 @@ func Test_reverse_sort_uniq()
endif
call assert_fails('call reverse("")', 'E899:')
- call assert_fails('call uniq([1, 2], {x, y -> []})', 'E882:')
+ call assert_fails('call uniq([1, 2], {x, y -> []})', 'E745:')
call assert_fails("call sort([1, 2], function('min'), 1)", "E715:")
call assert_fails("call sort([1, 2], function('invalid_func'))", "E700:")
- call assert_fails("call sort([1, 2], function('min'))", "E702:")
+ call assert_fails("call sort([1, 2], function('min'))", "E118:")
endfunc
" reduce a list or a blob
@@ -960,7 +960,7 @@ func Test_listdict_index()
call assert_fails('echo d[1:2]', 'E719:')
call assert_fails("let v = [4, 6][{-> 1}]", 'E729:')
call assert_fails("let v = range(5)[2:[]]", 'E730:')
- call assert_fails("let v = range(5)[2:{-> 2}(]", 'E116:')
+ call assert_fails("let v = range(5)[2:{-> 2}(]", ['E15:', 'E116:'])
call assert_fails("let v = range(5)[2:3", 'E111:')
call assert_fails("let l = insert([1,2,3], 4, 10)", 'E684:')
call assert_fails("let l = insert([1,2,3], 4, -10)", 'E684:')
diff --git a/src/testdir/test_listener.vim b/src/testdir/test_listener.vim
index c1fa45e7a5..7c69390b8a 100644
--- a/src/testdir/test_listener.vim
+++ b/src/testdir/test_listener.vim
@@ -210,8 +210,8 @@ func Test_listener_args()
" Invalid arguments
call assert_fails('call listener_add([])', 'E921:')
- call assert_fails('call listener_add("s:StoreListArgs", [])', 'E158:')
- call assert_fails('call listener_flush([])', 'E158:')
+ call assert_fails('call listener_add("s:StoreListArgs", [])', 'E730:')
+ call assert_fails('call listener_flush([])', 'E730:')
endfunc
func s:StoreBufList(buf, start, end, added, list)
diff --git a/src/testdir/test_match.vim b/src/testdir/test_match.vim
index e34c9f2790..869ad6c62e 100644
--- a/src/testdir/test_match.vim
+++ b/src/testdir/test_match.vim
@@ -160,7 +160,7 @@ endfunc
func Test_matchadd_error()
call assert_fails("call matchadd('GroupDoesNotExist', 'X')", 'E28:')
- call assert_fails("call matchadd('Search', '\\(')", 'E475:')
+ call assert_fails("call matchadd('Search', '\\(')", 'E54:')
call assert_fails("call matchadd('Search', 'XXX', 1, 123, 1)", 'E715:')
call assert_fails("call matchadd('Error', 'XXX', 1, 3)", 'E798:')
call assert_fails("call matchadd('Error', 'XXX', 1, 0)", 'E799:')
diff --git a/src/testdir/test_menu.vim b/src/testdir/test_menu.vim
index 4fd2828754..38098a1596 100644
--- a/src/testdir/test_menu.vim
+++ b/src/testdir/test_menu.vim
@@ -153,7 +153,7 @@ func Test_menu_errors()
call assert_fails('menu Test.Foo.Bar', 'E327:')
call assert_fails('cmenu Test.Foo', 'E328:')
call assert_fails('emenu x Test.Foo', 'E475:')
- call assert_fails('emenu Test.Foo.Bar', 'E334:')
+ call assert_fails('emenu Test.Foo.Bar', 'E327:')
call assert_fails('menutranslate Test', 'E474:')
silent! unmenu Foo
diff --git a/src/testdir/test_method.vim b/src/testdir/test_method.vim
index 7c0559a559..0d55f2a894 100644
--- a/src/testdir/test_method.vim
+++ b/src/testdir/test_method.vim
@@ -131,9 +131,9 @@ func Test_method_syntax()
eval [1, 2, 3]
\ ->sort(
\ )
- call assert_fails('eval [1, 2, 3]-> sort()', 'E260:')
+ call assert_fails('eval [1, 2, 3]-> sort()', 'E15:')
call assert_fails('eval [1, 2, 3]->sort ()', 'E274:')
- call assert_fails('eval [1, 2, 3]-> sort ()', 'E260:')
+ call assert_fails('eval [1, 2, 3]-> sort ()', 'E15:')
endfunc
func Test_method_lambda()
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index a4dc61945a..68aae534eb 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1384,7 +1384,7 @@ func Test_normal23_K()
call setline(1, '---')
call assert_fails('normal! ggv2lK', 'E349:')
call setline(1, ['abc', 'xyz'])
- call assert_fails("normal! gg2lv2h\<C-]>", 'E426:')
+ call assert_fails("normal! gg2lv2h\<C-]>", 'E433:')
call assert_beeps("normal! ggVjK")
" clean up
diff --git a/src/testdir/te