Patch 8.0.0426
Problem: Insufficient testing for statusline.
Solution: Add several tests. (Dominique Pelle, closes #1534)
Files: src/testdir/test_statusline.vim
*** ../vim-8.0.0425/src/testdir/test_statusline.vim 2016-04-04
23:03:08.000000000 +0200
--- src/testdir/test_statusline.vim 2017-03-06 20:27:03.627268819 +0100
***************
*** 1,19 ****
! function! StatuslineWithCaughtError()
let s:func_in_statusline_called = 1
try
call eval('unknown expression')
catch
endtry
return ''
! endfunction
! function! StatuslineWithError()
let s:func_in_statusline_called = 1
call eval('unknown expression')
return ''
! endfunction
! function! Test_caught_error_in_statusline()
let s:func_in_statusline_called = 0
set laststatus=2
let statusline = '%{StatuslineWithCaughtError()}'
--- 1,39 ----
! " Test 'statusline'
! "
! " Not tested yet:
! " %a
! " %N
! " %T
! " %X
! " %*
!
! source view_util.vim
!
! func s:get_statusline()
! return ScreenLines(&lines - 1, &columns)[0]
! endfunc
!
! func StatuslineWithCaughtError()
let s:func_in_statusline_called = 1
try
call eval('unknown expression')
catch
endtry
return ''
! endfunc
! func StatuslineWithError()
let s:func_in_statusline_called = 1
call eval('unknown expression')
return ''
! endfunc
! " Function used to display syntax group.
! func SyntaxItem()
! return synIDattr(synID(line("."),col("."),1),"name")
! endfunc
!
! func Test_caught_error_in_statusline()
let s:func_in_statusline_called = 0
set laststatus=2
let statusline = '%{StatuslineWithCaughtError()}'
***************
*** 22,30 ****
call assert_true(s:func_in_statusline_called)
call assert_equal(statusline, &statusline)
set statusline=
! endfunction
! function! Test_statusline_will_be_disabled_with_error()
let s:func_in_statusline_called = 0
set laststatus=2
let statusline = '%{StatuslineWithError()}'
--- 42,50 ----
call assert_true(s:func_in_statusline_called)
call assert_equal(statusline, &statusline)
set statusline=
! endfunc
! func Test_statusline_will_be_disabled_with_error()
let s:func_in_statusline_called = 0
set laststatus=2
let statusline = '%{StatuslineWithError()}'
***************
*** 36,39 ****
call assert_true(s:func_in_statusline_called)
call assert_equal('', &statusline)
set statusline=
! endfunction
--- 56,274 ----
call assert_true(s:func_in_statusline_called)
call assert_equal('', &statusline)
set statusline=
! endfunc
!
! func Test_statusline()
! new Xstatusline
! only
! set laststatus=2
! set splitbelow
! call setline(1, range(1, 200))
!
! " %b: Value of character under cursor.
! " %B: As above, in hexadecimal.
! call cursor(180, 2)
! set statusline=%b,%B
! call assert_match('^56,38\s*$', s:get_statusline())
!
! " %o: Byte number in file of byte under cursor, first byte is 1.
! " %O: As above, in hexadecimal.
! set statusline=%o,%O
! set fileformat=dos
! call assert_match('^789,315\s*$', s:get_statusline())
! set fileformat=mac
! call assert_match('^610,262\s*$', s:get_statusline())
! set fileformat=unix
! call assert_match('^610,262\s*$', s:get_statusline())
! set fileformat&
!
! " %f: Path to the file in the buffer, as typed or relative to current dir.
! set statusline=%f
! call assert_match('^Xstatusline\s*$', s:get_statusline())
!
! " %F: Full path to the file in the buffer.
! set statusline=%F
! call assert_match('/testdir/Xstatusline\s*$', s:get_statusline())
!
! " %h: Help buffer flag, text is "[help]".
! " %H: Help buffer flag, text is ",HLP".
! set statusline=%h,%H
! call assert_match('^,\s*$', s:get_statusline())
! help
! call assert_match('^\[Help\],HLP\s*$', s:get_statusline())
! helpclose
!
! " %k: Value of "b:keymap_name" or 'keymap'
! " when :lmap mappings are being used: <keymap>"
! set statusline=%k
! if has('keymap')
! set keymap=esperanto
! call assert_match('^<Eo>\s*$', s:get_statusline())
! set keymap&
! else
! call assert_match('^\s*$', s:get_statusline())
! endif
!
! " %l: Line number.
! " %L: Number of line in buffer.
! " %c: Column number.
! set statusline=%l/%L,%c
! call assert_match('^180/200,2\s*$', s:get_statusline())
!
! " %m: Modified flag, text is "[+]", "[-]" if 'modifiable' is off.
! " %M: Modified flag, text is ",+" or ",-".
! set statusline=%m%M
! call assert_match('^\[+\],+\s*$', s:get_statusline())
! set nomodifiable
! call assert_match('^\[+-\],+-\s*$', s:get_statusline())
! write
! call assert_match('^\[-\],-\s*$', s:get_statusline())
! set modifiable&
! call assert_match('^\s*$', s:get_statusline())
!
! " %n: Buffer number.
! set statusline=%n
! call assert_match('^'.bufnr('%').'\s*$', s:get_statusline())
!
! " %p: Percentage through file in lines as in CTRL-G.
! " %P: Percentage through file of displayed window.
! set statusline=%p,%P
! 0
! call assert_match('^0,Top\s*$', s:get_statusline())
! norm G
! call assert_match('^100,Bot\s*$', s:get_statusline())
! 180
! " Don't check the exact percentage as it depends on the window size
! call assert_match('^90,\(Top\|Bot\|\d\+%\)\s*$', s:get_statusline())
!
! " %q: "[Quickfix List]", "[Location List]" or empty.
! set statusline=%q
! call assert_match('^\s*$', s:get_statusline())
! copen
! call assert_match('^\[Quickfix List\]\s*$', s:get_statusline())
! cclose
! lexpr getline(1, 2)
! lopen
! call assert_match('^\[Location List\]\s*$', s:get_statusline())
! lclose
!
! " %r: Readonly flag, text is "[RO]".
! " %R: Readonly flag, text is ",RO".
! set statusline=%r,%R
! call assert_match('^,\s*$', s:get_statusline())
! help
! call assert_match('^\[RO\],RO\s*$', s:get_statusline())
! helpclose
!
! " %t: File name (tail) of file in the buffer.
! set statusline=%t
! call assert_match('^Xstatusline\s*$', s:get_statusline())
!
! " %v: Virtual column number.
! " %V: Virtual column number as -{num}. Not displayed if equal to 'c'.
! call cursor(180, 2)
! set statusline=%v,%V
! call assert_match('^2,\s*$', s:get_statusline())
! set virtualedit=all
! norm 10|
! call assert_match('^10,-10\s*$', s:get_statusline())
! set virtualedit&
!
! " %w: Preview window flag, text is "[Preview]".
! " %W: Preview window flag, text is ",PRV".
! set statusline=%w%W
! call assert_match('^\s*$', s:get_statusline())
! pedit
! wincmd j
! call assert_match('^\[Preview\],PRV\s*$', s:get_statusline())
! pclose
!
! " %y: Type of file in the buffer, e.g., "[vim]". See 'filetype'.
! " %Y: Type of file in the buffer, e.g., ",VIM". See 'filetype'.
! set statusline=%y\ %Y
! call assert_match('^\s*$', s:get_statusline())
! setfiletype vim
! call assert_match('^\[vim\] VIM\s*$', s:get_statusline())
!
! " %=: Separation point between left and right aligned items.
! set statusline=foo%=bar
! call assert_match('^foo\s\+bar\s*$', s:get_statusline())
!
! " Test min/max width, leading zeroes, left/right justify.
! set statusline=%04B
! call cursor(180, 2)
! call assert_match('^0038\s*$', s:get_statusline())
! set statusline=#%4B#
! call assert_match('^# 38#\s*$', s:get_statusline())
! set statusline=#%-4B#
! call assert_match('^#38 #\s*$', s:get_statusline())
! set statusline=%.6f
! call assert_match('^<sline\s*$', s:get_statusline())
!
! " %<: Where to truncate.
! exe 'set statusline=a%<b' . repeat('c', 1000) . 'd'
! call assert_match('^a<c*d$', s:get_statusline())
! exe 'set statusline=a' . repeat('b', 1000) . '%<c'
! call assert_match('^ab*>$', s:get_statusline())
!
! "%{: Evaluate expression between '%{' and '}' and substitute result.
! syntax on
! set statusline=%{SyntaxItem()}
! call assert_match('^vimNumber\s*$', s:get_statusline())
! s/^/"/
! call assert_match('^vimLineComment\s*$', s:get_statusline())
! syntax off
!
! "%(: Start of item group.
! set statusline=ab%(cd%q%)de
! call assert_match('^abde\s*$', s:get_statusline())
! copen
! call assert_match('^abcd\[Quickfix List\1]de\s*$', s:get_statusline())
! cclose
!
! " %#: Set highlight group. The name must follow and then a # again.
! set statusline=ab%#Todo#cd%#Error#ef
! call assert_match('^abcdef\s*$', s:get_statusline())
! let sa1=screenattr(&lines - 1, 1)
! let sa2=screenattr(&lines - 1, 3)
! let sa3=screenattr(&lines - 1, 5)
! call assert_notequal(sa1, sa2)
! call assert_notequal(sa1, sa3)
! call assert_notequal(sa2, sa3)
! call assert_equal(sa1, screenattr(&lines - 1, 2))
! call assert_equal(sa2, screenattr(&lines - 1, 4))
! call assert_equal(sa3, screenattr(&lines - 1, 6))
! call assert_equal(sa3, screenattr(&lines - 1, 7))
!
! " %*: Set highlight group to User{N}
! set statusline=a%1*b%0*c
! call assert_match('^abc\s*$', s:get_statusline())
! let sa1=screenattr(&lines - 1, 1)
! let sa2=screenattr(&lines - 1, 2)
! let sa3=screenattr(&lines - 1, 3)
! call assert_equal(sa1, sa3)
! call assert_notequal(sa1, sa2)
!
! " %%: a percent sign.
! set statusline=10%%
! call assert_match('^10%\s*$', s:get_statusline())
!
! " %!: evaluated expression is used as the option value
! set statusline=%!2*3+1
! call assert_match('7\s*$', s:get_statusline())
!
! " Check statusline in current and non-current window
! " with the 'fillchars' option.
! set fillchars=stl:^,stlnc:=,vert:\|,fold:-,diff:-
! vsplit
! set statusline=x%=y
! call assert_match('^x^\+y^x=\+y$', s:get_statusline())
! set fillchars&
! close
!
! %bw!
! call delete('Xstatusline')
! set statusline&
! set laststatus&
! set splitbelow&
! endfunc
*** ../vim-8.0.0425/src/version.c 2017-03-05 21:18:21.885452125 +0100
--- src/version.c 2017-03-06 20:22:17.893428870 +0100
***************
*** 766,767 ****
--- 766,769 ----
{ /* Add new patch number below this line */
+ /**/
+ 426,
/**/
--
hundred-and-one symptoms of being an internet addict:
70. ISDN lines are added to your house on a hourly basis
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
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].
For more options, visit https://groups.google.com/d/optout.
