diff options
| author | Matthieu Coudron <mattator@gmail.com> | 2020-07-19 18:41:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 18:41:40 +0200 |
| commit | daa5bffd93e19987980705990615c730fe07ea5f (patch) | |
| tree | 38e422d674d51d0a4c0fb49a4fb2d0423ec9d6d7 /test/functional | |
| parent | 8e350c1c6922f9c678e83d97227e7edd84967571 (diff) | |
| parent | 140a372017c7649e156742622c9ccc1cd8b794c1 (diff) | |
| download | rneovim-daa5bffd93e19987980705990615c730fe07ea5f.tar.gz rneovim-daa5bffd93e19987980705990615c730fe07ea5f.tar.bz2 rneovim-daa5bffd93e19987980705990615c730fe07ea5f.zip | |
Merge pull request #12611 from janlazo/vim-8.0.1531
vim-patch:8.0.{1531,1544,1589,1591,1712,1745,1747},8.1.{819},8.2.{420,539,893,894,895,899,1114,1118,1169,1170,1171,1172,1173,1177,1179,1180,1181,1187,1188,1196,1198,1211,1214,1215,1222}
Diffstat (limited to 'test/functional')
| -rw-r--r-- | test/functional/eval/null_spec.lua | 6 | ||||
| -rw-r--r-- | test/functional/legacy/assert_spec.lua | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/test/functional/eval/null_spec.lua b/test/functional/eval/null_spec.lua index afe999e1fa..db0a706319 100644 --- a/test/functional/eval/null_spec.lua +++ b/test/functional/eval/null_spec.lua @@ -47,10 +47,8 @@ describe('NULL', function() -- Subjectable behaviour - -- FIXME Should return 1 - null_expr_test('is equal to empty list', 'L == []', 0, 0) - -- FIXME Should return 1 - null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 0) + null_expr_test('is equal to empty list', 'L == []', 0, 1) + null_expr_test('is equal to empty list (reverse order)', '[] == L', 0, 1) -- Correct behaviour null_expr_test('can be indexed with error message for empty list', 'L[0]', diff --git a/test/functional/legacy/assert_spec.lua b/test/functional/legacy/assert_spec.lua index 3cb5d97869..d48b8882af 100644 --- a/test/functional/legacy/assert_spec.lua +++ b/test/functional/legacy/assert_spec.lua @@ -38,6 +38,9 @@ describe('assert function:', function() call assert_equal(4, n) let l = [1, 2, 3] call assert_equal([1, 2, 3], l) + call assert_equal(v:_null_list, v:_null_list) + call assert_equal(v:_null_list, []) + call assert_equal([], v:_null_list) fu Func() endfu let F1 = function('Func') @@ -92,6 +95,11 @@ describe('assert function:', function() call('assert_equal', 'foo', 'bar', 'testing') expected_errors({"testing: Expected 'foo' but got 'bar'"}) end) + + it('should shorten a long message', function() + call ('assert_equal', 'XxxxxxxxxxxxxxxxxxxxxxX', 'XyyyyyyyyyyyyyyyyyyyyyyyyyX') + expected_errors({"Expected 'X\\[x occurs 21 times]X' but got 'X\\[y occurs 25 times]X'"}) + end) end) -- assert_notequal({expected}, {actual}[, {msg}]) |