vim-patch:8.0.0254: error message of assert functions (#8488)

Problem:    When using an assert function one can either specify a message or
            get a message about what failed, not both.
Solution:   Concatenate the error with the message.
c7b831ca15
This commit is contained in:
Jan Edmund Lazo
2018-06-07 03:59:45 -04:00
committed by Justin M. Keyes
parent 36ac80d5dd
commit 7f6c1d256f
2 changed files with 38 additions and 30 deletions

View File

@@ -77,6 +77,11 @@ describe('assert function:', function()
eq('Vim(call):E724: unable to correctly dump variable with self-referencing container',
exc_exec('call CheckAssert()'))
end)
it('can specify a message and get a message about what failed', function()
call('assert_equal', 'foo', 'bar', 'testing')
expected_errors({"testing: Expected 'foo' but got 'bar'"})
end)
end)
-- assert_notequal({expected}, {actual}[, {msg}])
@@ -164,10 +169,10 @@ describe('assert function:', function()
call assert_true('', 'file two')
]])
expected_errors({
tmpname_one .. " line 1: 'equal assertion failed'",
tmpname_one .. " line 2: 'true assertion failed'",
tmpname_one .. " line 3: 'false assertion failed'",
tmpname_two .. " line 1: 'file two'",
tmpname_one .. " line 1: equal assertion failed: Expected 1 but got 100",
tmpname_one .. " line 2: true assertion failed: Expected False but got 'true'",
tmpname_one .. " line 3: false assertion failed: Expected True but got 'false'",
tmpname_two .. " line 1: file two: Expected True but got ''",
})
end)
@@ -198,7 +203,7 @@ describe('assert function:', function()
it('should set v:errors to msg when given and match fails', function()
call('assert_match', 'bar.*foo', 'foobar', 'wrong')
expected_errors({"'wrong'"})
expected_errors({"wrong: Pattern 'bar.*foo' does not match 'foobar'"})
end)
end)