IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/nvim/eval.c
View File

@ -6742,36 +6742,39 @@ static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv,
char_u *tofree; char_u *tofree;
if (opt_msg_tv->v_type != VAR_UNKNOWN) { if (opt_msg_tv->v_type != VAR_UNKNOWN) {
tofree = (char_u *) encode_tv2string(opt_msg_tv, NULL); tofree = (char_u *)encode_tv2echo(opt_msg_tv, NULL);
ga_concat(gap, tofree); ga_concat(gap, tofree);
xfree(tofree); xfree(tofree);
ga_concat(gap, (char_u *)": ");
}
if (atype == ASSERT_MATCH || atype == ASSERT_NOTMATCH) {
ga_concat(gap, (char_u *)"Pattern ");
} else if (atype == ASSERT_NOTEQUAL) {
ga_concat(gap, (char_u *)"Expected not equal to ");
} else { } else {
if (atype == ASSERT_MATCH || atype == ASSERT_NOTMATCH) { ga_concat(gap, (char_u *)"Expected ");
ga_concat(gap, (char_u *)"Pattern "); }
} else if (atype == ASSERT_NOTEQUAL) {
ga_concat(gap, (char_u *)"Expected not equal to "); if (exp_str == NULL) {
tofree = (char_u *)encode_tv2string(exp_tv, NULL);
ga_concat_esc(gap, tofree);
xfree(tofree);
} else {
ga_concat_esc(gap, exp_str);
}
if (atype != ASSERT_NOTEQUAL) {
if (atype == ASSERT_MATCH) {
ga_concat(gap, (char_u *)" does not match ");
} else if (atype == ASSERT_NOTMATCH) {
ga_concat(gap, (char_u *)" does match ");
} else { } else {
ga_concat(gap, (char_u *)"Expected "); ga_concat(gap, (char_u *)" but got ");
}
if (exp_str == NULL) {
tofree = (char_u *)encode_tv2string(exp_tv, NULL);
ga_concat_esc(gap, tofree);
xfree(tofree);
} else {
ga_concat_esc(gap, exp_str);
}
if (atype != ASSERT_NOTEQUAL) {
if (atype == ASSERT_MATCH) {
ga_concat(gap, (char_u *)" does not match ");
} else if (atype == ASSERT_NOTMATCH) {
ga_concat(gap, (char_u *)" does match ");
} else {
ga_concat(gap, (char_u *)" but got ");
}
tofree = (char_u *)encode_tv2string(got_tv, NULL);
ga_concat_esc(gap, tofree);
xfree(tofree);
} }
tofree = (char_u *)encode_tv2string(got_tv, NULL);
ga_concat_esc(gap, tofree);
xfree(tofree);
} }
} }

15
test/functional/legacy/assert_spec.lua
View File

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