aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/nvim/testdir/Makefile1
-rw-r--r--src/nvim/testdir/test_close_count.in156
-rw-r--r--src/nvim/testdir/test_close_count.ok23
-rw-r--r--test/functional/legacy/close_count_spec.lua133
4 files changed, 133 insertions, 180 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 90542a6a6c..15ba5d15f8 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -32,7 +32,6 @@ SCRIPTS := \
test73.out \
test79.out \
test_listlbr.out \
- test_close_count.out \
test_marks.out \
# Tests using runtest.vim.vim.
diff --git a/src/nvim/testdir/test_close_count.in b/src/nvim/testdir/test_close_count.in
deleted file mode 100644
index 58dfb425ce..0000000000
--- a/src/nvim/testdir/test_close_count.in
+++ /dev/null
@@ -1,156 +0,0 @@
-Tests for :[count]close! and :[count]hide vim: set ft=vim :
-
-STARTTEST
-:let tests = []
-:so tiny.vim
-:for i in range(5)
-:new
-:endfor
-:4wincmd w
-:close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:$close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1wincmd w
-:2close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1wincmd w
-:new
-:new
-:2wincmd w
-:-1close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:2wincmd w
-:+1close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:e! test.out
-:call append(0, map(copy(tests), 'join(v:val, " ")'))
-:w
-:only!
-:b1
-ENDTEST
-
-STARTTEST
-:let tests = []
-:so tiny.vim
-:for i in range(5)
-:new
-:endfor
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:4wincmd w
-:.hide
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1hide
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:$hide
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1wincmd w
-:2hide
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1wincmd w
-:new
-:new
-:3wincmd w
-:-hide
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:2wincmd w
-:+hide
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:e! test.out
-:call append(line('$'), map(copy(tests), 'join(v:val, " ")'))
-Go
-:w
-:only!
-:b1
-ENDTEST
-
-STARTTEST
-:let tests = []
-:so tiny.vim
-:set hidden
-:for i in range(5)
-:new
-:endfor
-:1wincmd w
-:$ hide
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:$-1 close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1wincmd w
-:.+close!
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:e! test.out
-:call append(line('$'), map(copy(tests), 'join(v:val, " ")'))
-Go
-:w
-:only!
-:b1
-ENDTEST
-
-STARTTEST
-:let tests = []
-:so tiny.vim
-:set hidden
-:for i in range(5)
-:new
-:endfor
-:4wincmd w
-c
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-1c
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-9c
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:1wincmd w
-2c
-:let buffers = []
-:windo call add(buffers, bufnr('%'))
-:call add(tests, buffers)
-:only!
-:e! test.out
-:call append(line('$'), map(copy(tests), 'join(v:val, " ")'))
-:w
-:qa!
-ENDTEST
-
-
diff --git a/src/nvim/testdir/test_close_count.ok b/src/nvim/testdir/test_close_count.ok
deleted file mode 100644
index 1cee870487..0000000000
--- a/src/nvim/testdir/test_close_count.ok
+++ /dev/null
@@ -1,23 +0,0 @@
-6 5 4 2 1
-5 4 2 1
-5 4 2
-5 2
-7 5 2
-7 5
-
-13 12 11 10 9 1
-13 12 11 9 1
-12 11 9 1
-12 11 9
-12 9
-15 12 9
-15 12
-
-20 19 18 17 16
-20 19 18 16
-20 18 16
-
-25 24 23 21 1
-24 23 21 1
-24 23 21
-24 21
diff --git a/test/functional/legacy/close_count_spec.lua b/test/functional/legacy/close_count_spec.lua
new file mode 100644
index 0000000000..ee6b29c618
--- /dev/null
+++ b/test/functional/legacy/close_count_spec.lua
@@ -0,0 +1,133 @@
+-- Tests for :[count]close! and :[count]hide
+
+local helpers = require('test.functional.helpers')
+local feed, eval, eq, clear, execute =
+ helpers.feed, helpers.eval, helpers.eq, helpers.clear, helpers.execute
+
+describe('close_count', function()
+ setup(clear)
+
+ it('is working', function()
+ execute('let tests = []')
+ execute('for i in range(5)')
+ execute('new')
+ execute('endfor')
+ execute('4wincmd w')
+ execute('close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({6, 5, 4, 2, 1}, eval('buffers'))
+ execute('1close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({5, 4, 2, 1}, eval('buffers'))
+ execute('$close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({5, 4, 2}, eval('buffers'))
+ execute('1wincmd w')
+ execute('2close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({5, 2}, eval('buffers'))
+ execute('1wincmd w')
+ execute('new')
+ execute('new')
+ execute('2wincmd w')
+ execute('-1close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({7, 5, 2}, eval('buffers'))
+ execute('2wincmd w')
+ execute('+1close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({7, 5}, eval('buffers'))
+ execute('only!')
+ execute('b1')
+ execute('let tests = []')
+ execute('for i in range(5)')
+ execute('new')
+ execute('endfor')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({13, 12, 11, 10, 9, 1}, eval('buffers'))
+ execute('4wincmd w')
+ execute('.hide')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({13, 12, 11, 9, 1}, eval('buffers'))
+ execute('1hide')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({12, 11, 9, 1}, eval('buffers'))
+ execute('$hide')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({12, 11, 9}, eval('buffers'))
+ execute('1wincmd w')
+ execute('2hide')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({12, 9}, eval('buffers'))
+ execute('1wincmd w')
+ execute('new')
+ execute('new')
+ execute('3wincmd w')
+ execute('-hide')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({15, 12, 9}, eval('buffers'))
+ execute('2wincmd w')
+ execute('+hide')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({15, 12}, eval('buffers'))
+ execute('only!')
+ execute('b1')
+ execute('let tests = []')
+ execute('set hidden')
+ execute('for i in range(5)')
+ execute('new')
+ execute('endfor')
+ execute('1wincmd w')
+ execute('$ hide')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({20, 19, 18, 17, 16}, eval('buffers'))
+ execute('$-1 close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({20, 19, 18, 16}, eval('buffers'))
+ execute('1wincmd w')
+ execute('.+close!')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({20, 18, 16}, eval('buffers'))
+ execute('only!')
+ execute('b1')
+ execute('let tests = []')
+ execute('set hidden')
+ execute('for i in range(5)')
+ execute('new')
+ execute('endfor')
+ execute('4wincmd w')
+ feed('<C-W>c<cr>')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({25, 24, 23, 21, 1}, eval('buffers'))
+ feed('1<C-W>c<cr>')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({24, 23, 21, 1}, eval('buffers'))
+ feed('9<C-W>c<cr>')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({24, 23, 21}, eval('buffers'))
+ execute('1wincmd w')
+ feed('2<C-W>c<cr>')
+ execute('let buffers = []')
+ execute('windo call add(buffers, bufnr("%"))')
+ eq({24, 21}, eval('buffers'))
+ end)
+end)
generated by cgit (git 2.34.1) at 2025-06-24 10:19:42 +0000