patch 9.0.0059: test file has wrong name
Problem: Test file has wrong name.
Solution: Rename the file. Various small fixes. (closes #10674)
diff --git a/src/testdir/test_statusline.vim b/src/testdir/test_statusline.vim
index 7c75f61..e60140f 100644
--- a/src/testdir/test_statusline.vim
+++ b/src/testdir/test_statusline.vim
@@ -7,6 +7,14 @@
source check.vim
source screendump.vim
+func SetUp()
+ set laststatus=2
+endfunc
+
+func TearDown()
+ set laststatus&
+endfunc
+
func s:get_statusline()
return ScreenLines(&lines - 1, &columns)[0]
endfunc
@@ -35,7 +43,6 @@
func Test_caught_error_in_statusline()
let s:func_in_statusline_called = 0
- set laststatus=2
let statusline = '%{StatuslineWithCaughtError()}'
let &statusline = statusline
redrawstatus
@@ -46,7 +53,6 @@
func Test_statusline_will_be_disabled_with_error()
let s:func_in_statusline_called = 0
- set laststatus=2
let statusline = '%{StatuslineWithError()}'
try
let &statusline = statusline
@@ -73,7 +79,6 @@
call assert_match('^ ((2) of 2)\s*$', s:get_statusline())
only
- set laststatus=2
set splitbelow
call setline(1, range(1, 10000))
@@ -432,7 +437,6 @@
%bw!
call delete('Xstatusline')
set statusline&
- set laststatus&
set splitbelow&
endfunc
@@ -518,7 +522,6 @@
" with a custom 'statusline'
func Test_statusline_mbyte_fillchar()
only
- set laststatus=2
set fillchars=vert:\|,fold:-,stl:━,stlnc:═
set statusline=a%=b
call assert_match('^a\+━\+b$', s:get_statusline())
@@ -526,7 +529,7 @@
call assert_match('^a\+━\+b━a\+═\+b$', s:get_statusline())
wincmd w
call assert_match('^a\+═\+b═a\+━\+b$', s:get_statusline())
- set statusline& fillchars& laststatus&
+ set statusline& fillchars&
%bw!
endfunc