diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-14 20:06:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-14 20:06:14 +0100 |
| commit | 5869cf060e60cc09e71b2b3bd85f0576ec78f9f5 (patch) | |
| tree | 12b84676d1718a5ab703c711a5a2f50d33b59956 | |
| parent | fad609d067926d350b4e4ee6ecb55bdbf111a272 (diff) | |
patch 8.0.0186: confusing error message from assert_notequal()v8.0.0186
Problem: The error message from assert_notequal() is confusing.
Solution: Only mention the expected value.
| -rw-r--r-- | src/eval.c | 23 | ||||
| -rw-r--r-- | src/testdir/test_assert.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 11 deletions
diff --git a/src/eval.c b/src/eval.c index 5bed90b3b5..f70d03b369 100644 --- a/src/eval.c +++ b/src/eval.c @@ -9256,6 +9256,8 @@ fill_assert_error( { 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 ga_concat(gap, (char_u *)"Expected "); if (exp_str == NULL) @@ -9265,16 +9267,17 @@ fill_assert_error( } else ga_concat_esc(gap, exp_str); - 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 if (atype == ASSERT_NOTEQUAL) - ga_concat(gap, (char_u *)" differs from "); - else - ga_concat(gap, (char_u *)" but got "); - ga_concat_esc(gap, tv2string(got_tv, &tofree, numbuf, 0)); - vim_free(tofree); + 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 "); + ga_concat_esc(gap, tv2string(got_tv, &tofree, numbuf, 0)); + vim_free(tofree); + } } } diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim index 25630f2dbc..8c54bddb8a 100644 --- a/src/testdir/test_assert.vim +++ b/src/testdir/test_assert.vim @@ -32,7 +32,7 @@ func Test_assert_notequal() call assert_notequal([1, 2, 3], s) call assert_notequal('foo', s) - call assert_match("Expected 'foo' differs from 'foo'", v:errors[0]) + call assert_match("Expected not equal to 'foo'", v:errors[0]) call remove(v:errors, 0) endfunc diff --git a/src/version.c b/src/version.c index d5fa5495ec..6511b36957 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 186, +/**/ 185, /**/ 184, |