diff --git a/test/tabline.vim b/test/tabline.vim index 8f28a6d..304b1be 100644 --- a/test/tabline.vim +++ b/test/tabline.vim @@ -24,8 +24,10 @@ function! s:suite.tabline_disabled() call s:assert.equals(&tabline, '') endfunction -function! s:tab(number, active, last) abort - return '%' . a:number . 'T%{lightline#onetab(' . a:number . ',' . a:active . ')}' . (a:last ? '%T' : '') +function! s:tab(number, ...) abort + let active = get(a:000, 0, 0) + let last = get(a:000, 1, 0) + return '%' . a:number . 'T%{lightline#onetab(' . a:number . ',' . active . ')}' . (last ? '%T' : '') endfunction function! s:suite.init() @@ -34,40 +36,40 @@ endfunction function! s:suite.tabnew() tabnew - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0)], [s:tab(2, 1, 1)], []]) + call s:assert.equals(lightline#tabs(), [[s:tab(1)], [s:tab(2, 1, 1)], []]) endfunction function! s:suite.tabnew_tabnew() tabnew tabnew - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0), s:tab(2, 0, 0)], [s:tab(3, 1, 1)], []]) + call s:assert.equals(lightline#tabs(), [[s:tab(1), s:tab(2)], [s:tab(3, 1, 1)], []]) endfunction function! s:suite.tabnew_tabfirst() tabnew tabfirst - call s:assert.equals(lightline#tabs(), [[], [s:tab(1, 1, 0)], [s:tab(2, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[], [s:tab(1, 1)], [s:tab(2, 0, 1)]]) endfunction function! s:suite.tabnew_tabnew_tabfirst() tabnew tabnew tabfirst - call s:assert.equals(lightline#tabs(), [[], [s:tab(1, 1, 0)], [s:tab(2, 0, 0), s:tab(3, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[], [s:tab(1, 1)], [s:tab(2), s:tab(3, 0, 1)]]) endfunction function! s:suite.tabnew_tabnew_tabprevious() tabnew tabnew tabprevious - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0)], [s:tab(2, 1, 0)], [s:tab(3, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[s:tab(1)], [s:tab(2, 1)], [s:tab(3, 0, 1)]]) endfunction function! s:suite.tabnew_20() for i in range(19) tabnew endfor - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0), s:tab(2, 0, 0), s:tab(3, 0, 0), s:tab(4, 0, 0), '...', s:tab(16, 0, 0), s:tab(17, 0, 0), s:tab(18, 0, 0), s:tab(19, 0, 0)], [s:tab(20, 1, 1)], []]) + call s:assert.equals(lightline#tabs(), [[s:tab(1), s:tab(2), s:tab(3), s:tab(4), '...', s:tab(16), s:tab(17), s:tab(18), s:tab(19)], [s:tab(20, 1, 1)], []]) endfunction function! s:suite.tabnew_20_tabfirst() @@ -75,7 +77,7 @@ function! s:suite.tabnew_20_tabfirst() tabnew endfor tabfirst - call s:assert.equals(lightline#tabs(), [[], [s:tab(1, 1, 0)], [s:tab(2, 0, 0), s:tab(3, 0, 0), s:tab(4, 0, 0), s:tab(5, 0, 0), '...', s:tab(17, 0, 0), s:tab(18, 0, 0), s:tab(19, 0, 0), s:tab(20, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[], [s:tab(1, 1)], [s:tab(2), s:tab(3), s:tab(4), s:tab(5), '...', s:tab(17), s:tab(18), s:tab(19), s:tab(20, 0, 1)]]) endfunction function! s:suite.tabnew_20_tabfirst_tabnext() @@ -84,7 +86,7 @@ function! s:suite.tabnew_20_tabfirst_tabnext() endfor tabfirst tabnext - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0)], [s:tab(2, 1, 0)], [s:tab(3, 0, 0), s:tab(4, 0, 0), s:tab(5, 0, 0), s:tab(6, 0, 0), '...', s:tab(18, 0, 0), s:tab(19, 0, 0), s:tab(20, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[s:tab(1)], [s:tab(2, 1)], [s:tab(3), s:tab(4), s:tab(5), s:tab(6), '...', s:tab(18), s:tab(19), s:tab(20, 0, 1)]]) endfunction function! s:suite.tabnew_20_tabnext_10() @@ -92,7 +94,7 @@ function! s:suite.tabnew_20_tabnext_10() tabnew endfor tabnext 10 - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0), s:tab(2, 0, 0), '...', s:tab(8, 0, 0), s:tab(9, 0, 0)], [s:tab(10, 1, 0)], [s:tab(11, 0, 0), s:tab(12, 0, 0), '...', s:tab(19, 0, 0), s:tab(20, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[s:tab(1), s:tab(2), '...', s:tab(8), s:tab(9)], [s:tab(10, 1)], [s:tab(11), s:tab(12), '...', s:tab(19), s:tab(20, 0, 1)]]) endfunction function! s:suite.tabnew_20_tabprevious() @@ -100,7 +102,7 @@ function! s:suite.tabnew_20_tabprevious() tabnew endfor tabprevious - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0), s:tab(2, 0, 0), s:tab(3, 0, 0), '...', s:tab(15, 0, 0), s:tab(16, 0, 0), s:tab(17, 0, 0), s:tab(18, 0, 0)], [s:tab(19, 1, 0)], [s:tab(20, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[s:tab(1), s:tab(2), s:tab(3), '...', s:tab(15), s:tab(16), s:tab(17), s:tab(18)], [s:tab(19, 1)], [s:tab(20, 0, 1)]]) endfunction function! s:suite.tabnew_20_tabprevious_tabprevious() @@ -109,7 +111,7 @@ function! s:suite.tabnew_20_tabprevious_tabprevious() endfor tabprevious tabprevious - call s:assert.equals(lightline#tabs(), [[s:tab(1, 0, 0), s:tab(2, 0, 0), s:tab(3, 0, 0), '...', s:tab(15, 0, 0), s:tab(16, 0, 0), s:tab(17, 0, 0)], [s:tab(18, 1, 0)], [s:tab(19, 0, 0), s:tab(20, 0, 1)]]) + call s:assert.equals(lightline#tabs(), [[s:tab(1), s:tab(2), s:tab(3), '...', s:tab(15), s:tab(16), s:tab(17)], [s:tab(18, 1)], [s:tab(19), s:tab(20, 0, 1)]]) endfunction function! s:suite.onetab()