patch 8.2.0789: Vim9: expression testing lost coverage using constants

Problem:    Vim9: expression testing lost coverage using constants.
Solution:   Use a few variables instead of constants.

diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 6fabf0c9f73fd320c9d7e59a9b3f49646b0de965..e0776b53130b427fc73e7aba3bed503b9dc58378 100644 (file)
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -153,9 +153,13 @@ let adict = #{aaa: 2, bbb: 8}
 
 " test == comperator
 def Test_expr4_equal()
+  let trueVar = true
+  let falseVar = false
   assert_equal(true, true == true)
   assert_equal(false, true ==
                        false)
+  assert_equal(true, true == trueVar)
+  assert_equal(false, true == falseVar)
   assert_equal(true, true == g:atrue)
   assert_equal(false, g:atrue == false)
 
@@ -164,8 +168,12 @@ def Test_expr4_equal()
   assert_equal(true, g:anone == v:none)
   assert_equal(false, v:none == g:anull)
 
+  let nr0 = 0
+  let nr61 = 61
   assert_equal(false, 2 == 0)
+  assert_equal(false, 2 == nr0)
   assert_equal(true, 61 == 61)
+  assert_equal(true, 61 == nr61)
   assert_equal(true, g:anint == 10)
   assert_equal(false, 61 == g:anint)
 
@@ -237,9 +245,13 @@ enddef
 
 " test != comperator
 def Test_expr4_notequal()
+  let trueVar = true
+  let falseVar = false
   assert_equal(false, true != true)
   assert_equal(true, true !=
                        false)
+  assert_equal(false, true != trueVar)
+  assert_equal(true, true != falseVar)
   assert_equal(false, true != g:atrue)
   assert_equal(true, g:atrue != false)
 
@@ -248,8 +260,12 @@ def Test_expr4_notequal()
   assert_equal(false, g:anone != v:none)
   assert_equal(true, v:none != g:anull)
 
+  let nr55 = 55
+  let nr0 = 55
   assert_equal(true, 2 != 0)
+  assert_equal(true, 2 != nr0)
   assert_equal(false, 55 != 55)
+  assert_equal(false, 55 != nr55)
   assert_equal(false, g:anint != 10)
   assert_equal(true, 61 != g:anint)
 
@@ -313,6 +329,12 @@ def Test_expr4_greater()
                1)
   assert_false(2 > 2)
   assert_false(2 > 3)
+  let nr2 = 2
+  assert_true(nr2 > 0)
+  assert_true(nr2 >
+               1)
+  assert_false(nr2 > 2)
+  assert_false(nr2 > 3)
   if has('float')
     let ff = 2.0
     assert_true(ff > 0.0)
@@ -328,6 +350,10 @@ def Test_expr4_greaterequal()
   assert_true(2 >=
                        2)
   assert_false(2 >= 3)
+  let nr2 = 2
+  assert_true(nr2 >= 0)
+  assert_true(nr2 >= 2)
+  assert_false(nr2 >= 3)
   if has('float')
     let ff = 2.0
     assert_true(ff >= 0.0)
@@ -342,6 +368,10 @@ def Test_expr4_smaller()
   assert_false(2 <
                        2)
   assert_true(2 < 3)
+  let nr2 = 2
+  assert_false(nr2 < 0)
+  assert_false(nr2 < 2)
+  assert_true(nr2 < 3)
   if has('float')
     let ff = 2.0
     assert_false(ff < 0.0)
@@ -357,6 +387,11 @@ def Test_expr4_smallerequal()
                        1)
   assert_true(2 <= 2)
   assert_true(2 <= 3)
+  let nr2 = 2
+  assert_false(nr2 <= 0)
+  assert_false(nr2 <= 1)
+  assert_true(nr2 <= 2)
+  assert_true(nr2 <= 3)
   if has('float')
     let ff = 2.0
     assert_false(ff <= 0.0)

diff --git a/src/version.c b/src/version.c
index 4dcae55f026a57ba59fda7f90ae37a058643cbe9..53d69d54be7424aec09b1d381a37b34cafc80c16 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    789,
 /**/
     788,
 /**/