aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_command_count.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-02-03 12:11:07 +0100
committerJustin M. Keyes <justinkz@gmail.com>2018-02-11 19:03:27 +0100
commit9b6ed6c71ca0c5573e36bd35bb5c906fdc3e0269 (patch)
tree139d8058cf4676308fa27b6e097167cfa9621090 /src/nvim/testdir/test_command_count.vim
parent348193f49c45c5ba74ce367a7fa192308f50e746 (diff)
downloadrneovim-9b6ed6c71ca0c5573e36bd35bb5c906fdc3e0269.tar.gz
rneovim-9b6ed6c71ca0c5573e36bd35bb5c906fdc3e0269.tar.bz2
rneovim-9b6ed6c71ca0c5573e36bd35bb5c906fdc3e0269.zip
vim-patch:8.0.1224: still interference between test functions
Problem: Still interference between test functions. Solution: Clear autocommands. Wipe all buffers. Fix tests that depend on a specific start context. https://github.com/vim/vim/commit/cf1ba35fc2ebd41b9a7738bbd1f026f5311560aa
Diffstat (limited to 'src/nvim/testdir/test_command_count.vim')
-rw-r--r--src/nvim/testdir/test_command_count.vim20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/nvim/testdir/test_command_count.vim b/src/nvim/testdir/test_command_count.vim
index e438a8b077..2d793ed88f 100644
--- a/src/nvim/testdir/test_command_count.vim
+++ b/src/nvim/testdir/test_command_count.vim
@@ -1,6 +1,7 @@
" Test for user command counts.
func Test_command_count_0()
+ let bufnr = bufnr('%')
set hidden
set noswapfile
@@ -15,17 +16,17 @@ func Test_command_count_0()
command! -range=% -addr=buffers RangeBuffersAll :let lines = [<line1>, <line2>]
.,$RangeLoadedBuffers
- call assert_equal([1, 1], lines)
+ call assert_equal([bufnr, bufnr], lines)
%RangeLoadedBuffers
- call assert_equal([1, 1], lines)
+ call assert_equal([bufnr, bufnr], lines)
RangeLoadedBuffersAll
- call assert_equal([1, 1], lines)
+ call assert_equal([bufnr, bufnr], lines)
.,$RangeBuffers
- call assert_equal([1, lastbuf], lines)
+ call assert_equal([bufnr, lastbuf], lines)
%RangeBuffers
- call assert_equal([1, lastbuf], lines)
+ call assert_equal([bufnr, lastbuf], lines)
RangeBuffersAll
- call assert_equal([1, lastbuf], lines)
+ call assert_equal([bufnr, lastbuf], lines)
delcommand RangeLoadedBuffers
delcommand RangeLoadedBuffersAll
@@ -138,6 +139,7 @@ func Test_command_count_2()
endfunc
func Test_command_count_3()
+ let bufnr = bufnr('%')
se nohidden
e aaa
let buf_aaa = bufnr('%')
@@ -145,7 +147,7 @@ func Test_command_count_3()
let buf_bbb = bufnr('%')
e ccc
let buf_ccc = bufnr('%')
- buf 1
+ exe bufnr . 'buf'
call assert_equal([1, 1, 1], [buflisted(buf_aaa), buflisted(buf_bbb), buflisted(buf_ccc)])
exe buf_bbb . "," . buf_ccc . "bdelete"
call assert_equal([1, 0, 0], [buflisted(buf_aaa), buflisted(buf_bbb), buflisted(buf_ccc)])
@@ -155,7 +157,7 @@ endfunc
func Test_command_count_4()
%argd
- let bufnr = bufnr('$') + 1
+ let bufnr = bufnr('$')
arga aa bb cc dd ee ff
3argu
let args = []
@@ -171,6 +173,8 @@ func Test_command_count_4()
only!
exe bufnr . 'buf'
+ bnext
+ let bufnr = bufnr('%')
let buffers = []
.,$-bufdo call add(buffers, bufnr('%'))
call assert_equal([bufnr, bufnr + 1, bufnr + 2, bufnr + 3, bufnr + 4], buffers)