patch 8.1.1826: tests use hand coded feature and option checks
Problem: Tests use hand coded feature and option checks.
Solution: Use the commands from check.vim in more tests.
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 2c6aa24..71548ed 100644
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -1,6 +1,7 @@
" Tests for mappings and abbreviations
source shared.vim
+source check.vim
func Test_abbreviation()
" abbreviation with 0x80 should work
@@ -399,7 +400,9 @@
endfunc
func Test_error_in_map_expr()
- if !has('terminal') || (has('win32') && has('gui_running'))
+ " Unlike CheckRunVimInTerminal this does work in a win32 console
+ CheckFeature terminal
+ if has('win32') && has('gui_running')
throw 'Skipped: cannot run Vim in a terminal window'
endif