diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-11-06 15:22:00 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-11-06 15:22:00 +0100 |
commit | fcf8a8743bdecc0ba28037b79b7cb2962de70b1d (patch) | |
tree | cb52d76377bb263b4550881d2cc84e7d536012c6 /src | |
parent | 215ba3b63698f3755b2c4de66fc728cc14a8a590 (diff) |
patch 8.1.2264: there are two test files for :letv8.1.2264
Problem: There are two test files for :let.
Solution: Merge the two files.
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/Make_all.mak | 1 | ||||
-rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_assign.vim | 53 | ||||
-rw-r--r-- | src/testdir/test_let.vim | 52 | ||||
-rw-r--r-- | src/version.c | 2 |
5 files changed, 54 insertions, 55 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index f3906ac947..6b86b37ec1 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -58,7 +58,6 @@ NEW_TESTS = \ test_arabic \ test_arglist \ test_assert \ - test_assign \ test_autochdir \ test_autocmd \ test_autoload \ diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index 216ff6c7ef..894ec5848f 100644 --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -1,7 +1,6 @@ " A series of tests that can run in one Vim invocation. " This makes testing go faster, since Vim doesn't need to restart. -source test_assign.vim source test_backup.vim source test_behave.vim source test_bufline.vim diff --git a/src/testdir/test_assign.vim b/src/testdir/test_assign.vim deleted file mode 100644 index 1715a3f03b..0000000000 --- a/src/testdir/test_assign.vim +++ /dev/null @@ -1,53 +0,0 @@ -" Test for assignment - -func Test_no_type_checking() - let v = 1 - let v = [1,2,3] - let v = {'a': 1, 'b': 2} - let v = 3.4 - let v = 'hello' -endfunc - -func Test_let_termcap() - " Terminal code - let old_t_te = &t_te - let &t_te = "\<Esc>[yes;" - call assert_match('t_te.*^[[yes;', execute("set termcap")) - let &t_te = old_t_te - - if exists("+t_k1") - " Key code - let old_t_k1 = &t_k1 - let &t_k1 = "that" - call assert_match('t_k1.*that', execute("set termcap")) - let &t_k1 = old_t_k1 - endif - - call assert_fails('let x = &t_xx', 'E113') - let &t_xx = "yes" - call assert_equal("yes", &t_xx) - let &t_xx = "" - call assert_fails('let x = &t_xx', 'E113') -endfunc - -func Test_let_option_error() - let _w = &tw - let &tw = 80 - call assert_fails('let &tw .= 1', 'E734') - call assert_equal(80, &tw) - let &tw = _w - - let _w = &fillchars - let &fillchars = "vert:|" - call assert_fails('let &fillchars += "diff:-"', 'E734') - call assert_equal("vert:|", &fillchars) - let &fillchars = _w -endfunc - -func Test_let_errors() - let s = 'abcd' - call assert_fails('let s[1] = 5', 'E689:') - - let l = [1, 2, 3] - call assert_fails('let l[:] = 5', 'E709:') -endfunc diff --git a/src/testdir/test_let.vim b/src/testdir/test_let.vim index 76b750599e..4d9aae96f1 100644 --- a/src/testdir/test_let.vim +++ b/src/testdir/test_let.vim @@ -152,6 +152,58 @@ func Test_let_utf8_environment() call assert_equal('ĀĒĪŌŪあいうえお', $a) endfunc +func Test_let_no_type_checking() + let v = 1 + let v = [1,2,3] + let v = {'a': 1, 'b': 2} + let v = 3.4 + let v = 'hello' +endfunc + +func Test_let_termcap() + " Terminal code + let old_t_te = &t_te + let &t_te = "\<Esc>[yes;" + call assert_match('t_te.*^[[yes;', execute("set termcap")) + let &t_te = old_t_te + + if exists("+t_k1") + " Key code + let old_t_k1 = &t_k1 + let &t_k1 = "that" + call assert_match('t_k1.*that', execute("set termcap")) + let &t_k1 = old_t_k1 + endif + + call assert_fails('let x = &t_xx', 'E113') + let &t_xx = "yes" + call assert_equal("yes", &t_xx) + let &t_xx = "" + call assert_fails('let x = &t_xx', 'E113') +endfunc + +func Test_let_option_error() + let _w = &tw + let &tw = 80 + call assert_fails('let &tw .= 1', 'E734') + call assert_equal(80, &tw) + let &tw = _w + + let _w = &fillchars + let &fillchars = "vert:|" + call assert_fails('let &fillchars += "diff:-"', 'E734') + call assert_equal("vert:|", &fillchars) + let &fillchars = _w +endfunc + +func Test_let_errors() + let s = 'abcd' + call assert_fails('let s[1] = 5', 'E689:') + + let l = [1, 2, 3] + call assert_fails('let l[:] = 5', 'E709:') +endfunc + func Test_let_heredoc_fails() call assert_fails('let v =<< marker', 'E991:') diff --git a/src/version.c b/src/version.c index fe0d8052f4..8dcefd48fd 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2264, +/**/ 2263, /**/ 2262, |