aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustaf Lindstedt <gustaflindstedt@gmail.com>2015-02-28 19:26:50 +0800
committerJustin M. Keyes <justinkz@gmail.com>2015-03-16 10:54:36 -0400
commit311f09e20f11618e25fa489cf5abe2ee7c67d169 (patch)
tree815e40db8a5769f26580e62919d19289825a266f
parentf6d4bfd51bb68d84bfc265fa973ea75978ecf304 (diff)
downloadrneovim-311f09e20f11618e25fa489cf5abe2ee7c67d169.tar.gz
rneovim-311f09e20f11618e25fa489cf5abe2ee7c67d169.tar.bz2
rneovim-311f09e20f11618e25fa489cf5abe2ee7c67d169.zip
legacy tests: migrate test89
-rw-r--r--src/nvim/testdir/test89.in71
-rw-r--r--src/nvim/testdir/test89.ok28
-rw-r--r--test/functional/legacy/089_number_relnumber_findfile_spec.lua116
3 files changed, 116 insertions, 99 deletions
diff --git a/src/nvim/testdir/test89.in b/src/nvim/testdir/test89.in
deleted file mode 100644
index f1f64fb41f..0000000000
--- a/src/nvim/testdir/test89.in
+++ /dev/null
@@ -1,71 +0,0 @@
-- Some tests for setting 'number' and 'relativenumber'
- This is not all that useful now that the options are no longer reset when
- setting the other.
-- Some tests for findfile() function
-
-STARTTEST
-:so small.vim
-:set hidden nu rnu
-:redir @a | set nu? rnu? | redir END
-:e! xx
-:redir @b | set nu? rnu? | redir END
-:e! #
-:$put ='results:'
-:$put a
-:$put b
-:"
-:set nonu nornu
-:setglobal nu
-:setlocal rnu
-:redir @c | setglobal nu? | redir END
-:set nonu nornu
-:setglobal rnu
-:setlocal nu
-:redir @d | setglobal rnu? | redir END
-:$put =':setlocal must NOT reset the other global value'
-:$put c
-:$put d
-:"
-:set nonu nornu
-:setglobal nu
-:setglobal rnu
-:redir @e | setglobal nu? | redir END
-:set nonu nornu
-:setglobal rnu
-:setglobal nu
-:redir @f | setglobal rnu? | redir END
-:$put =':setglobal MUST reset the other global value'
-:$put e
-:$put f
-:"
-:set nonu nornu
-:set nu
-:set rnu
-:redir @g | setglobal nu? | redir END
-:set nonu nornu
-:set rnu
-:set nu
-:redir @h | setglobal rnu? | redir END
-:$put =':set MUST reset the other global value'
-:$put g
-:$put h
-:"
-:let cwd=getcwd()
-:cd ..
-:" Tests may be run from a shadow directory, so an extra cd needs to be done to
-:" get above src/
-:if fnamemodify(getcwd(), ':t') != 'src' | cd ../.. | else | cd .. | endif
-:$put =''
-:$put ='Testing findfile'
-:$put =''
-:set ssl
-:$put =findfile('test19.in','src/nvim/test*')
-:exe "cd" cwd
-:cd ..
-:$put =findfile('test19.in','test*')
-:$put =findfile('test19.in','testdir')
-:exe "cd" cwd
-:/^results/,$w! test.out
-:q!
-ENDTEST
-
diff --git a/src/nvim/testdir/test89.ok b/src/nvim/testdir/test89.ok
deleted file mode 100644
index c8accd8569..0000000000
--- a/src/nvim/testdir/test89.ok
+++ /dev/null
@@ -1,28 +0,0 @@
-results:
-
- number
- relativenumber
-
- number
- relativenumber
-:setlocal must NOT reset the other global value
-
- number
-
- relativenumber
-:setglobal MUST reset the other global value
-
- number
-
- relativenumber
-:set MUST reset the other global value
-
- number
-
- relativenumber
-
-Testing findfile
-
-src/nvim/testdir/test19.in
-testdir/test19.in
-testdir/test19.in
diff --git a/test/functional/legacy/089_number_relnumber_findfile_spec.lua b/test/functional/legacy/089_number_relnumber_findfile_spec.lua
new file mode 100644
index 0000000000..1f8e49cc81
--- /dev/null
+++ b/test/functional/legacy/089_number_relnumber_findfile_spec.lua
@@ -0,0 +1,116 @@
+-- - Some tests for setting 'number' and 'relativenumber'
+-- This is not all that useful now that the options are no longer reset when
+-- setting the other.
+
+local helpers = require('test.functional.helpers')
+local feed = helpers.feed
+local clear, execute, expect, source = helpers.clear, helpers.execute, helpers.expect, helpers.source
+
+describe("setting 'number' and 'relativenumber'", function()
+ setup(clear)
+
+ it('is working', function()
+ source([[
+ set hidden nu rnu
+ redir @a | set nu? | set rnu? | redir END
+ e! xx
+ redir @b | set nu? | set rnu? | redir END
+ e! #
+ $put ='results:'
+ $put a
+ $put b
+
+ set nonu nornu
+ setglobal nu
+ setlocal rnu
+ redir @c | setglobal nu? | redir END
+ set nonu nornu
+ setglobal rnu
+ setlocal nu
+ redir @d | setglobal rnu? | redir END
+ $put =':setlocal must NOT reset the other global value'
+ $put c
+ $put d
+
+ set nonu nornu
+ setglobal nu
+ setglobal rnu
+ redir @e | setglobal nu? | redir END
+ set nonu nornu
+ setglobal rnu
+ setglobal nu
+ redir @f | setglobal rnu? | redir END
+ $put =':setglobal MUST reset the other global value'
+ $put e
+ $put f
+
+ set nonu nornu
+ set nu
+ set rnu
+ redir @g | setglobal nu? | redir END
+ set nonu nornu
+ set rnu
+ set nu
+ redir @h | setglobal rnu? | redir END
+ $put =':set MUST reset the other global value'
+ $put g
+ $put h
+ ]])
+
+ -- Remove empty line
+ feed('ggdd')
+
+ -- Assert buffer contents.
+ expect([[
+ results:
+
+ number
+ relativenumber
+
+ number
+ relativenumber
+ :setlocal must NOT reset the other global value
+
+ number
+
+ relativenumber
+ :setglobal MUST reset the other global value
+
+ number
+
+ relativenumber
+ :set MUST reset the other global value
+
+ number
+
+ relativenumber]])
+ end)
+end)
+
+-- - Some tests for findfile() function
+describe('findfile', function()
+ setup(clear)
+
+ it('is working', function()
+ -- Assume test is being run from project root
+ source([[
+ $put ='Testing findfile'
+ $put =''
+ set ssl
+ $put =findfile('vim.c','src/nvim/ap*')
+ cd src/nvim
+ $put =findfile('vim.c','ap*')
+ $put =findfile('vim.c','api')
+ ]])
+
+ -- Remove empty line
+ feed('ggdd')
+
+ expect([[
+ Testing findfile
+
+ src/nvim/api/vim.c
+ api/vim.c
+ api/vim.c]])
+ end)
+end)