patch 9.1.1569: tests: Vim9 tests can be improved
Commit:
https://github.com/vim/vim/commit/ba023e135b29f85e89f2c3882b9cf313f0e2bd02
Author: Yegappan Lakshmanan <[email protected]>
Date: Sun Jul 20 09:55:07 2025 +0200
patch 9.1.1569: tests: Vim9 tests can be improved
Problem: tests: Vim9 tests can be improved
Solution: In Test_has_func_shortcircuit(), move the test functions to a
separate script (Yegappan Lakshmanan)
closes: #17796
Signed-off-by: Yegappan Lakshmanan <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 268ceb482..0008f1e51 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -5267,59 +5267,83 @@ enddef
" Test for using more than one has() check in a compound if condition.
def Test_has_func_shortcircuit()
- def Has_And1_Cond(): string
- # true && false
- if has('jumplist') && has('foobar')
- return 'present'
- endif
- return 'missing'
- enddef
- assert_equal('missing', Has_And1_Cond())
+ var lines =<< trim END
+ vim9script
+ def Has_And1_Cond(): string
+ # true && false
+ if has('jumplist') && has('foobar')
+ return 'present'
+ endif
+ return 'missing'
+ enddef
+ assert_equal('missing', Has_And1_Cond())
+ END
+ v9.CheckSourceSuccess(lines)
- def Has_And2_Cond(): string
- # false && true
- if has('foobar') && has('jumplist')
- return 'present'
- endif
- return 'missing'
- enddef
- assert_equal('missing', Has_And2_Cond())
+ lines =<< trim END
+ vim9script
+ def Has_And2_Cond(): string
+ # false && true
+ if has('foobar') && has('jumplist')
+ return 'present'
+ endif
+ return 'missing'
+ enddef
+ assert_equal('missing', Has_And2_Cond())
+ END
+ v9.CheckSourceSuccess(lines)
- def Has_And3_Cond(): string
- # false && false
- if has('foobar') && has('foobaz')
- return 'present'
- endif
- return 'missing'
- enddef
- assert_equal('missing', Has_And3_Cond())
+ lines =<< trim END
+ vim9script
+ def Has_And3_Cond(): string
+ # false && false
+ if has('foobar') && has('foobaz')
+ return 'present'
+ endif
+ return 'missing'
+ enddef
+ assert_equal('missing', Has_And3_Cond())
+ END
+ v9.CheckSourceSuccess(lines)
- def Has_Or1_Cond(): string
- # true || false
- if has('jumplist') || has('foobar')
- return 'present'
- endif
- return 'missing'
- enddef
- assert_equal('present', Has_Or1_Cond())
+ lines =<< trim END
+ vim9script
+ def Has_Or1_Cond(): string
+ # true || false
+ if has('jumplist') || has('foobar')
+ return 'present'
+ endif
+ return 'missing'
+ enddef
+ assert_equal('present', Has_Or1_Cond())
+ END
+ v9.CheckSourceSuccess(lines)
- def Has_Or2_Cond(): string
- # false || true
- if has('foobar') || has('jumplist')
- return 'present'
- endif
- return 'missing'
- enddef
- assert_equal('present', Has_Or2_Cond())
+ lines =<< trim END
+ vim9script
+ def Has_Or2_Cond(): string
+ # false || true
+ if has('foobar') || has('jumplist')
+ return 'present'
+ endif
+ return 'missing'
+ enddef
+ assert_equal('present', Has_Or2_Cond())
+ END
+ v9.CheckSourceSuccess(lines)
- def Has_Or3_Cond(): string
- # false || false
- if has('foobar') || has('foobaz')
- return 'present'
- endif
- return 'missing'
- enddef
- assert_equal('missing', Has_Or3_Cond())
+ lines =<< trim END
+ vim9script
+ def Has_Or3_Cond(): string
+ # false || false
+ if has('foobar') || has('foobaz')
+ return 'present'
+ endif
+ return 'missing'
+ enddef
+ assert_equal('missing', Has_Or3_Cond())
+ END
+ v9.CheckSourceSuccess(lines)
enddef
" Test for using more than one len() function in a compound if condition.
diff --git a/src/version.c b/src/version.c
index 62f61e4a7..7297bc8cc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -719,6 +719,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1569,
/**/
1568,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1udOxr-00GmKh-Ar%40256bit.org.
