diff options
Diffstat (limited to 'test/functional/lua')
-rw-r--r-- | test/functional/lua/commands_spec.lua | 44 | ||||
-rw-r--r-- | test/functional/lua/overrides_spec.lua | 47 |
2 files changed, 47 insertions, 44 deletions
diff --git a/test/functional/lua/commands_spec.lua b/test/functional/lua/commands_spec.lua index f2a1b7dede..2e0d0ea899 100644 --- a/test/functional/lua/commands_spec.lua +++ b/test/functional/lua/commands_spec.lua @@ -15,14 +15,14 @@ local command = helpers.command local exc_exec = helpers.exc_exec local pcall_err = helpers.pcall_err local write_file = helpers.write_file -local redir_exec = helpers.redir_exec +local exec_capture = helpers.exec_capture local curbufmeths = helpers.curbufmeths before_each(clear) describe(':lua command', function() it('works', function() - eq('', redir_exec( + eq('', exec_capture( 'lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"TEST"})')) eq({'', 'TEST'}, curbufmeths.get_lines(0, 100, false)) source(dedent([[ @@ -67,18 +67,19 @@ describe(':lua command', function() eq({'', 'ETTS', 'TTSE', 'STTE'}, curbufmeths.get_lines(0, 100, false)) end) it('preserves global and not preserves local variables', function() - eq('', redir_exec('lua gvar = 42')) - eq('', redir_exec('lua local lvar = 100500')) + eq('', exec_capture('lua gvar = 42')) + eq('', exec_capture('lua local lvar = 100500')) eq(NIL, funcs.luaeval('lvar')) eq(42, funcs.luaeval('gvar')) end) it('works with long strings', function() local s = ('x'):rep(100500) - eq('\nE5107: Error loading lua [string ":lua"]:1: unfinished string near \'<eof>\'', redir_exec(('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s})'):format(s))) + eq('Vim(lua):E5107: Error loading lua [string ":lua"]:0: unfinished string near \'<eof>\'', + pcall_err(command, ('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s})'):format(s))) eq({''}, curbufmeths.get_lines(0, -1, false)) - eq('', redir_exec(('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s"})'):format(s))) + eq('', exec_capture(('lua vim.api.nvim_buf_set_lines(1, 1, 2, false, {"%s"})'):format(s))) eq({'', s}, curbufmeths.get_lines(0, -1, false)) end) @@ -144,34 +145,34 @@ end) describe(':luado command', function() it('works', function() curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"}) - eq('', redir_exec('luado lines = (lines or {}) lines[#lines + 1] = {linenr, line}')) + eq('', exec_capture('luado lines = (lines or {}) lines[#lines + 1] = {linenr, line}')) eq({'ABC', 'def', 'gHi'}, curbufmeths.get_lines(0, -1, false)) eq({{1, 'ABC'}, {2, 'def'}, {3, 'gHi'}}, funcs.luaeval('lines')) -- Automatic transformation of numbers - eq('', redir_exec('luado return linenr')) + eq('', exec_capture('luado return linenr')) eq({'1', '2', '3'}, curbufmeths.get_lines(0, -1, false)) - eq('', redir_exec('luado return ("<%02x>"):format(line:byte())')) + eq('', exec_capture('luado return ("<%02x>"):format(line:byte())')) eq({'<31>', '<32>', '<33>'}, curbufmeths.get_lines(0, -1, false)) end) it('stops processing lines when suddenly out of lines', function() curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"}) - eq('', redir_exec('2,$luado runs = ((runs or 0) + 1) vim.api.nvim_command("%d")')) + eq('', exec_capture('2,$luado runs = ((runs or 0) + 1) vim.api.nvim_command("%d")')) eq({''}, curbufmeths.get_lines(0, -1, false)) eq(1, funcs.luaeval('runs')) end) it('works correctly when changing lines out of range', function() curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"}) - eq('\nE322: line number out of range: 1 past the end\nE320: Cannot find line 2', - redir_exec('2,$luado vim.api.nvim_command("%d") return linenr')) + eq('Vim(luado):E322: line number out of range: 1 past the end', + pcall_err(command, '2,$luado vim.api.nvim_command("%d") return linenr')) eq({''}, curbufmeths.get_lines(0, -1, false)) end) it('fails on errors', function() - eq([[Vim(luado):E5109: Error loading lua: [string ":luado"]:1: unexpected symbol near ')']], - exc_exec('luado ()')) - eq([[Vim(luado):E5111: Error calling lua: [string ":luado"]:1: attempt to perform arithmetic on global 'liness' (a nil value)]], - exc_exec('luado return liness + 1')) + eq([[Vim(luado):E5109: Error loading lua: [string ":luado"]:0: unexpected symbol near ')']], + pcall_err(command, 'luado ()')) + eq([[Vim(luado):E5111: Error calling lua: [string ":luado"]:0: attempt to perform arithmetic on global 'liness' (a nil value)]], + pcall_err(command, 'luado return liness + 1')) end) it('works with NULL errors', function() eq([=[Vim(luado):E5111: Error calling lua: [NULL]]=], @@ -179,17 +180,18 @@ describe(':luado command', function() end) it('fails in sandbox when needed', function() curbufmeths.set_lines(0, 1, false, {"ABC", "def", "gHi"}) - eq('\nE48: Not allowed in sandbox: sandbox luado runs = (runs or 0) + 1', - redir_exec('sandbox luado runs = (runs or 0) + 1')) + eq('Vim(luado):E48: Not allowed in sandbox', + pcall_err(command, 'sandbox luado runs = (runs or 0) + 1')) eq(NIL, funcs.luaeval('runs')) end) it('works with long strings', function() local s = ('x'):rep(100500) - eq('\nE5109: Error loading lua: [string ":luado"]:1: unfinished string near \'<eof>\'', redir_exec(('luado return "%s'):format(s))) + eq('Vim(luado):E5109: Error loading lua: [string ":luado"]:0: unfinished string near \'<eof>\'', + pcall_err(command, ('luado return "%s'):format(s))) eq({''}, curbufmeths.get_lines(0, -1, false)) - eq('', redir_exec(('luado return "%s"'):format(s))) + eq('', exec_capture(('luado return "%s"'):format(s))) eq({s}, curbufmeths.get_lines(0, -1, false)) end) end) @@ -207,7 +209,7 @@ describe(':luafile', function() vim.api.nvim_buf_set_lines(1, 2, 3, false, {"TTSE"}) vim.api.nvim_buf_set_lines(1, 3, 4, false, {"STTE"}) ]]) - eq('', redir_exec('luafile ' .. fname)) + eq('', exec_capture('luafile ' .. fname)) eq({'', 'ETTS', 'TTSE', 'STTE'}, curbufmeths.get_lines(0, 100, false)) end) diff --git a/test/functional/lua/overrides_spec.lua b/test/functional/lua/overrides_spec.lua index 267c759faf..636479b81f 100644 --- a/test/functional/lua/overrides_spec.lua +++ b/test/functional/lua/overrides_spec.lua @@ -11,8 +11,9 @@ local meths = helpers.meths local iswin = helpers.iswin local command = helpers.command local write_file = helpers.write_file -local redir_exec = helpers.redir_exec +local exec_capture = helpers.exec_capture local exec_lua = helpers.exec_lua +local pcall_err = helpers.pcall_err local screen @@ -36,11 +37,11 @@ describe('print', function() write_file(fname, 'print("abc")') eq('\nabc', funcs.execute('luafile ' .. fname)) - eq('\nabc', redir_exec('lua print("abc")')) - eq('\nabc', redir_exec('luado print("abc")')) - eq('\nabc', redir_exec('call luaeval("print(\'abc\')")')) + eq('abc', exec_capture('lua print("abc")')) + eq('abc', exec_capture('luado print("abc")')) + eq('abc', exec_capture('call luaeval("print(\'abc\')")')) write_file(fname, 'print("abc")') - eq('\nabc', redir_exec('luafile ' .. fname)) + eq('abc', exec_capture('luafile ' .. fname)) end) it('handles errors in __tostring', function() write_file(fname, [[ @@ -51,30 +52,30 @@ describe('print', function() v_abcerr = setmetatable({}, meta_abcerr) v_tblout = setmetatable({}, meta_tblout) ]]) - eq('', redir_exec('luafile ' .. fname)) + eq('', exec_capture('luafile ' .. fname)) -- TODO(bfredl): these look weird, print() should not use "E5114:" style errors.. - eq('\nE5108: Error executing lua E5114: Error while converting print argument #2: [NULL]', - redir_exec('lua print("foo", v_nilerr, "bar")')) - eq('\nE5108: Error executing lua E5114: Error while converting print argument #2: Xtest-functional-lua-overrides-luafile:2: abc', - redir_exec('lua print("foo", v_abcerr, "bar")')) - eq('\nE5108: Error executing lua E5114: Error while converting print argument #2: <Unknown error: lua_tolstring returned NULL for tostring result>', - redir_exec('lua print("foo", v_tblout, "bar")')) + eq('Vim(lua):E5108: Error executing lua E5114: Error while converting print argument #2: [NULL]', + pcall_err(command, 'lua print("foo", v_nilerr, "bar")')) + eq('Vim(lua):E5108: Error executing lua E5114: Error while converting print argument #2: Xtest-functional-lua-overrides-luafile:0: abc', + pcall_err(command, 'lua print("foo", v_abcerr, "bar")')) + eq('Vim(lua):E5108: Error executing lua E5114: Error while converting print argument #2: <Unknown error: lua_tolstring returned NULL for tostring result>', + pcall_err(command, 'lua print("foo", v_tblout, "bar")')) end) it('prints strings with NULs and NLs correctly', function() meths.set_option('more', true) - eq('\nabc ^@ def\nghi^@^@^@jkl\nTEST\n\n\nT\n', - redir_exec([[lua print("abc \0 def\nghi\0\0\0jkl\nTEST\n\n\nT\n")]])) - eq('\nabc ^@ def\nghi^@^@^@jkl\nTEST\n\n\nT^@', - redir_exec([[lua print("abc \0 def\nghi\0\0\0jkl\nTEST\n\n\nT\0")]])) - eq('\nT^@', redir_exec([[lua print("T\0")]])) - eq('\nT\n', redir_exec([[lua print("T\n")]])) + eq('abc ^@ def\nghi^@^@^@jkl\nTEST\n\n\nT\n', + exec_capture([[lua print("abc \0 def\nghi\0\0\0jkl\nTEST\n\n\nT\n")]])) + eq('abc ^@ def\nghi^@^@^@jkl\nTEST\n\n\nT^@', + exec_capture([[lua print("abc \0 def\nghi\0\0\0jkl\nTEST\n\n\nT\0")]])) + eq('T^@', exec_capture([[lua print("T\0")]])) + eq('T\n', exec_capture([[lua print("T\n")]])) end) it('prints empty strings correctly', function() -- Regression: first test used to crash - eq('', redir_exec('lua print("")')) - eq('\n def', redir_exec('lua print("", "def")')) - eq('\nabc ', redir_exec('lua print("abc", "")')) - eq('\nabc def', redir_exec('lua print("abc", "", "def")')) + eq('', exec_capture('lua print("")')) + eq(' def', exec_capture('lua print("", "def")')) + eq('abc ', exec_capture('lua print("abc", "")')) + eq('abc def', exec_capture('lua print("abc", "", "def")')) end) it('defers printing in luv event handlers', function() exec_lua([[ @@ -97,7 +98,7 @@ describe('print', function() vim.api.nvim_command("sleep 1m") -- force deferred event processing end ]], (iswin() and "timeout 1") or "sleep 0.1") - eq('\nvery slow\nvery fast',redir_exec('lua test()')) + eq('very slow\nvery fast', exec_capture('lua test()')) end) end) |