OSDN > Finden Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

patch 8.2.2046: some test failures don't give a clear error

Commit: https://github.com/vim/vim/commit/5dc4e2f883896c99ebe83355822ac6067970b031
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Nov 25 14:15:12 2020 +0100

patch 8.2.2046: some test failures don't give a clear error

Problem: Some test failures don't give a clear error.
Solution: Use assert_match() and assert_fails() instead of assert_true().

(Ken Takata, closes #7368)

diff -r 8a52dc676c59 -r ffb173dbf228 src/testdir/test_autocmd.vim

--- a/src/testdir/test_autocmd.vim Wed Nov 25 14:00:04 2020 +0100

+++ b/src/testdir/test_autocmd.vim Wed Nov 25 14:30:05 2020 +0100

		@@ -300,28 +300,28 @@
300	300	augroup TheWarning
301	301	au VimEnter * echo 'entering'
302	302	augroup END
303		- call assert_true(match(execute('au VimEnter'), "TheWarning.*VimEnter") >= 0)
	303	+ call assert_match("TheWarning.*VimEnter", execute('au VimEnter'))
304	304	redir => res
305	305	augroup! TheWarning
306	306	redir END
307		- call assert_true(match(res, "W19:") >= 0)
308		- call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
	307	+ call assert_match("W19:", res)
	308	+ call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
309	309
310	310	" check "Another" does not take the pace of the deleted entry
311	311	augroup Another
312	312	augroup END
313		- call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
	313	+ call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
314	314	augroup! Another
315	315
316	316	" no warning for postpone aucmd delete
317	317	augroup StartOK
318	318	au VimEnter * call RemoveGroup()
319	319	augroup END
320		- call assert_true(match(execute('au VimEnter'), "StartOK.*VimEnter") >= 0)
	320	+ call assert_match("StartOK.*VimEnter", execute('au VimEnter'))
321	321	redir => res
322	322	doautocmd VimEnter
323	323	redir END
324		- call assert_true(match(res, "W19:") < 0)
	324	+ call assert_notmatch("W19:", res)
325	325	au! VimEnter
326	326
327	327	call assert_fails('augroup!', 'E471:')

		@@ -351,7 +351,7 @@
351	351	au VimEnter * echo
352	352	augroup end
353	353	augroup! x
354		- call assert_true(match(execute('au VimEnter'), "-Deleted-.*VimEnter") >= 0)
	354	+ call assert_match("-Deleted-.*VimEnter", execute('au VimEnter'))
355	355	au! VimEnter
356	356	endfunc
357	357

diff -r 8a52dc676c59 -r ffb173dbf228 src/testdir/test_backspace_opt.vim

--- a/src/testdir/test_backspace_opt.vim Wed Nov 25 14:00:04 2020 +0100

+++ b/src/testdir/test_backspace_opt.vim Wed Nov 25 14:30:05 2020 +0100

		@@ -1,15 +1,5 @@
1	1	" Tests for 'backspace' settings
2	2
3		-func Exec(expr)
4		- let str=''
5		- try
6		- exec a:expr
7		- catch /.*/
8		- let str=v:exception
9		- endtry
10		- return str
11		-endfunc
12		-
13	3	func Test_backspace_option()
14	4	set backspace=
15	5	call assert_equal('', &backspace)

		@@ -41,10 +31,10 @@
41	31	set backspace-=eol
42	32	call assert_equal('', &backspace)
43	33	" Check the error
44		- call assert_equal(0, match(Exec('set backspace=ABC'), '.*E474:'))
45		- call assert_equal(0, match(Exec('set backspace+=def'), '.*E474:'))
	34	+ call assert_fails('set backspace=ABC', 'E474:')
	35	+ call assert_fails('set backspace+=def', 'E474:')
46	36	" NOTE: Vim doesn't check following error...
47		- "call assert_equal(0, match(Exec('set backspace-=ghi'), '.*E474:'))
	37	+ "call assert_fails('set backspace-=ghi', 'E474:')
48	38
49	39	" Check backwards compatibility with version 5.4 and earlier
50	40	set backspace=0

		@@ -55,8 +45,8 @@
55	45	call assert_equal('2', &backspace)
56	46	set backspace=3
57	47	call assert_equal('3', &backspace)
58		- call assert_false(match(Exec('set backspace=4'), '.*E474:'))
59		- call assert_false(match(Exec('set backspace=10'), '.*E474:'))
	48	+ call assert_fails('set backspace=4', 'E474:')
	49	+ call assert_fails('set backspace=10', 'E474:')
60	50
61	51	" Cleared when 'compatible' is set
62	52	set compatible

diff -r 8a52dc676c59 -r ffb173dbf228 src/version.c

--- a/src/version.c Wed Nov 25 14:00:04 2020 +0100

+++ b/src/version.c Wed Nov 25 14:30:05 2020 +0100

		@@ -751,6 +751,8 @@
751	751	static int included_patches[] =
752	752	{ /* Add new patch number below this line */
753	753	/**/
	754	+ 2046,
	755	+/**/
754	756	2045,
755	757	/**/
756	758	2044,