patch 8.0.1770: assert functions don't return anythingv8.0.1770

Problem:    Assert functions don't return anything.
Solution:   Return non-zero when the assertion fails.

1 files changed, 46 insertions, 38 deletions

diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim
index 0de6ceb7c9..61147286fb 100644
--- a/src/testdir/test_assert.vim
+++ b/src/testdir/test_assert.vim
@@ -1,58 +1,66 @@
 " Test that the methods used for testing work.
 
 func Test_assert_false()
-  call assert_false(0)
-  call assert_false(v:false)
+  call assert_equal(0, assert_false(0))
+  call assert_equal(0, assert_false(v:false))
+
+  call assert_equal(1, assert_false(123))
+  call assert_match("Expected False but got 123", v:errors[0])
+  call remove(v:errors, 0)
 endfunc
 
 func Test_assert_true()
-  call assert_true(1)
-  call assert_true(123)
-  call assert_true(v:true)
+  call assert_equal(0, assert_true(1))
+  call assert_equal(0, assert_true(123))
+  call assert_equal(0, assert_true(v:true))
+
+  call assert_equal(1, assert_true(0))
+  call assert_match("Expected True but got 0", v:errors[0])
+  call remove(v:errors, 0)
 endfunc
 
 func Test_assert_equal()
   let s = 'foo'
-  call assert_equal('foo', s)
+  call assert_equal(0, assert_equal('foo', s))
   let n = 4
-  call assert_equal(4, n)
+  call assert_equal(0, assert_equal(4, n))
   let l = [1, 2, 3]
-  call assert_equal([1, 2, 3], l)
+  call assert_equal(0, assert_equal([1, 2, 3], l))
 
   let s = 'foo'
-  call assert_equal('bar', s)
+  call assert_equal(1, assert_equal('bar', s))
   call assert_match("Expected 'bar' but got 'foo'", v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
 func Test_assert_equalfile()
-  call assert_equalfile('abcabc', 'xyzxyz')
+  call assert_equal(1, assert_equalfile('abcabc', 'xyzxyz'))
   call assert_match("E485: Can't read file abcabc", v:errors[0])
   call remove(v:errors, 0)
 
   let goodtext = ["one", "two", "three"]
   call writefile(goodtext, 'Xone')
-  call assert_equalfile('Xone', 'xyzxyz')
+  call assert_equal(1, assert_equalfile('Xone', 'xyzxyz'))
   call assert_match("E485: Can't read file xyzxyz", v:errors[0])
   call remove(v:errors, 0)
 
   call writefile(goodtext, 'Xtwo')
-  call assert_equalfile('Xone', 'Xtwo')
+  call assert_equal(0, assert_equalfile('Xone', 'Xtwo'))
 
   call writefile([goodtext[0]], 'Xone')
-  call assert_equalfile('Xone', 'Xtwo')
+  call assert_equal(1, assert_equalfile('Xone', 'Xtwo'))
   call assert_match("first file is shorter", v:errors[0])
   call remove(v:errors, 0)
 
   call writefile(goodtext, 'Xone')
   call writefile([goodtext[0]], 'Xtwo')
-  call assert_equalfile('Xone', 'Xtwo')
+  call assert_equal(1, assert_equalfile('Xone', 'Xtwo'))
   call assert_match("second file is shorter", v:errors[0])
   call remove(v:errors, 0)
 
   call writefile(['1234X89'], 'Xone')
   call writefile(['1234Y89'], 'Xtwo')
-  call assert_equalfile('Xone', 'Xtwo')
+  call assert_equal(1, assert_equalfile('Xone', 'Xtwo'))
   call assert_match("difference at byte 4", v:errors[0])
   call remove(v:errors, 0)
 
@@ -62,17 +70,17 @@ endfunc
 
 func Test_assert_notequal()
   let n = 4
-  call assert_notequal('foo', n)
+  call assert_equal(0, assert_notequal('foo', n))
   let s = 'foo'
-  call assert_notequal([1, 2, 3], s)
+  call assert_equal(0, assert_notequal([1, 2, 3], s))
 
-  call assert_notequal('foo', s)
+  call assert_equal(1, assert_notequal('foo', s))
   call assert_match("Expected not equal to 'foo'", v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
 func Test_assert_report()
-  call assert_report('something is wrong')
+  call assert_equal(1, assert_report('something is wrong'))
   call assert_match('something is wrong', v:errors[0])
   call remove(v:errors, 0)
 endfunc
@@ -81,7 +89,7 @@ func Test_assert_exception()
   try
     nocommand
   catch
-    call assert_exception('E492:')
+    call assert_equal(0, assert_exception('E492:'))
   endtry
 
   try
@@ -89,9 +97,9 @@ func Test_assert_exception()
   catch
     try
       " illegal argument, get NULL for error
-      call assert_exception([])
+      call assert_equal(1, assert_exception([]))
     catch
-      call assert_exception('E730:')
+      call assert_equal(0, assert_exception('E730:'))
     endtry
   endtry
 endfunc
@@ -113,59 +121,59 @@ func Test_compare_fail()
   try
     call assert_equal(s:w, '')
   catch
-    call assert_exception('E724:')
+    call assert_equal(0, assert_exception('E724:'))
     call assert_match("Expected NULL but got ''", v:errors[0])
     call remove(v:errors, 0)
   endtry
 endfunc
 
 func Test_match()
-  call assert_match('^f.*b.*r$', 'foobar')
+  call assert_equal(0, assert_match('^f.*b.*r$', 'foobar'))
 
-  call assert_match('bar.*foo', 'foobar')
+  call assert_equal(1, assert_match('bar.*foo', 'foobar'))
   call assert_match("Pattern 'bar.*foo' does not match 'foobar'", v:errors[0])
   call remove(v:errors, 0)
 
-  call assert_match('bar.*foo', 'foobar', 'wrong')
+  call assert_equal(1, assert_match('bar.*foo', 'foobar', 'wrong'))
   call assert_match('wrong', v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
 func Test_notmatch()
-  call assert_notmatch('foo', 'bar')
-  call assert_notmatch('^foobar$', 'foobars')
+  call assert_equal(0, assert_notmatch('foo', 'bar'))
+  call assert_equal(0, assert_notmatch('^foobar$', 'foobars'))
 
-  call assert_notmatch('foo', 'foobar')
+  call assert_equal(1, assert_notmatch('foo', 'foobar'))
   call assert_match("Pattern 'foo' does match 'foobar'", v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
 func Test_assert_fail_fails()
-  call assert_fails('xxx', {})
+  call assert_equal(1, assert_fails('xxx', {}))
   call assert_match("Expected {} but got 'E731:", v:errors[0])
   call remove(v:errors, 0)
 endfunc
 
 func Test_assert_beeps()
   new
-  call assert_beeps('normal h')
+  call assert_equal(0, assert_beeps('normal h'))
 
-  call assert_beeps('normal 0')
+  call assert_equal(1, assert_beeps('normal 0'))
   call assert_match("command did not beep: normal 0", v:errors[0])
   call remove(v:errors, 0)
   bwipe
 endfunc
 
 func Test_assert_inrange()
-  call assert_inrange(7, 7, 7)
-  call assert_inrange(5, 7, 5)
-  call assert_inrange(5, 7, 6)
-  call assert_inrange(5, 7, 7)
+  call assert_equal(0, assert_inrange(7, 7, 7))
+  call assert_equal(0, assert_inrange(5, 7, 5))
+  call assert_equal(0, assert_inrange(5, 7, 6))
+  call assert_equal(0, assert_inrange(5, 7, 7))
 
-  call assert_inrange(5, 7, 4)
+  call assert_equal(1, assert_inrange(5, 7, 4))
   call assert_match("Expected range 5 - 7, but got 4", v:errors[0])
   call remove(v:errors, 0)
-  call assert_inrange(5, 7, 8)
+  call assert_equal(1, assert_inrange(5, 7, 8))
   call assert_match("Expected range 5 - 7, but got 8", v:errors[0])
   call remove(v:errors, 0)