aboutsummaryrefslogtreecommitdiff
path: root/test/functional/provider
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/provider')
-rw-r--r--test/functional/provider/define_spec.lua359
-rw-r--r--test/functional/provider/python_spec.lua82
2 files changed, 244 insertions, 197 deletions
diff --git a/test/functional/provider/define_spec.lua b/test/functional/provider/define_spec.lua
index 6e8a3b89cd..c30ad6d8c2 100644
--- a/test/functional/provider/define_spec.lua
+++ b/test/functional/provider/define_spec.lua
@@ -64,153 +64,137 @@ local function command_specs_for(fn, sync, first_arg_factory, init)
args = args..', "RpcCommand"'
end)
- describe('without options', function()
- it('ok', function()
- call(fn, args..', {}')
- local function on_setup()
- command('RpcCommand')
- end
+ it('without options', function()
+ call(fn, args..', {}')
+ local function on_setup()
+ command('RpcCommand')
+ end
- local function handler(method)
- eq('test-handler', method)
- return ''
- end
+ local function handler(method)
+ eq('test-handler', method)
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with nargs', function()
- it('ok', function()
- call(fn, args..', {"nargs": "*"}')
- local function on_setup()
- command('RpcCommand arg1 arg2 arg3')
- end
+ it('with nargs', function()
+ call(fn, args..', {"nargs": "*"}')
+ local function on_setup()
+ command('RpcCommand arg1 arg2 arg3')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({'arg1', 'arg2', 'arg3'}, arguments[1])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({'arg1', 'arg2', 'arg3'}, arguments[1])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with range', function()
- it('ok', function()
- call(fn,args..', {"range": ""}')
- local function on_setup()
- command('1,1RpcCommand')
- end
+ it('with range', function()
+ call(fn,args..', {"range": ""}')
+ local function on_setup()
+ command('1,1RpcCommand')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({1, 1}, arguments[1])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({1, 1}, arguments[1])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with nargs/range', function()
- it('ok', function()
- call(fn, args..', {"nargs": "1", "range": ""}')
- local function on_setup()
- command('1,1RpcCommand arg')
- end
+ it('with nargs/range', function()
+ call(fn, args..', {"nargs": "1", "range": ""}')
+ local function on_setup()
+ command('1,1RpcCommand arg')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({'arg'}, arguments[1])
- eq({1, 1}, arguments[2])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({'arg'}, arguments[1])
+ eq({1, 1}, arguments[2])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with nargs/count', function()
- it('ok', function()
- call(fn, args..', {"nargs": "1", "range": "5"}')
- local function on_setup()
- command('5RpcCommand arg')
- end
+ it('with nargs/count', function()
+ call(fn, args..', {"nargs": "1", "range": "5"}')
+ local function on_setup()
+ command('5RpcCommand arg')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({'arg'}, arguments[1])
- eq(5, arguments[2])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({'arg'}, arguments[1])
+ eq(5, arguments[2])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with nargs/count/bang', function()
- it('ok', function()
- call(fn, args..', {"nargs": "1", "range": "5", "bang": ""}')
- local function on_setup()
- command('5RpcCommand! arg')
- end
+ it('with nargs/count/bang', function()
+ call(fn, args..', {"nargs": "1", "range": "5", "bang": ""}')
+ local function on_setup()
+ command('5RpcCommand! arg')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({'arg'}, arguments[1])
- eq(5, arguments[2])
- eq(1, arguments[3])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({'arg'}, arguments[1])
+ eq(5, arguments[2])
+ eq(1, arguments[3])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with nargs/count/bang/register', function()
- it('ok', function()
- call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'..
- ' "register": ""}')
- local function on_setup()
- command('5RpcCommand! b arg')
- end
+ it('with nargs/count/bang/register', function()
+ call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'..
+ ' "register": ""}')
+ local function on_setup()
+ command('5RpcCommand! b arg')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({'arg'}, arguments[1])
- eq(5, arguments[2])
- eq(1, arguments[3])
- eq('b', arguments[4])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({'arg'}, arguments[1])
+ eq(5, arguments[2])
+ eq(1, arguments[3])
+ eq('b', arguments[4])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with nargs/count/bang/register/eval', function()
- it('ok', function()
- call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'..
- ' "register": "", "eval": "@<reg>"}')
- local function on_setup()
- command('let @b = "regb"')
- command('5RpcCommand! b arg')
- end
+ it('with nargs/count/bang/register/eval', function()
+ call(fn, args..', {"nargs": "1", "range": "5", "bang": "",'..
+ ' "register": "", "eval": "@<reg>"}')
+ local function on_setup()
+ command('let @b = "regb"')
+ command('5RpcCommand! b arg')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({'arg'}, arguments[1])
- eq(5, arguments[2])
- eq(1, arguments[3])
- eq('b', arguments[4])
- eq('regb', arguments[5])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({'arg'}, arguments[1])
+ eq(5, arguments[2])
+ eq(1, arguments[3])
+ eq('b', arguments[4])
+ eq('regb', arguments[5])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
end)
end)
@@ -236,37 +220,33 @@ local function autocmd_specs_for(fn, sync, first_arg_factory, init)
args = args..', "BufEnter"'
end)
- describe('without options', function()
- it('ok', function()
- call(fn, args..', {}')
- local function on_setup()
- command('doautocmd BufEnter x.c')
- end
+ it('without options', function()
+ call(fn, args..', {}')
+ local function on_setup()
+ command('doautocmd BufEnter x.c')
+ end
- local function handler(method)
- eq('test-handler', method)
- return ''
- end
+ local function handler(method)
+ eq('test-handler', method)
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with eval', function()
- it('ok', function()
- call(fn, args..[[, {'eval': 'expand("<afile>")'}]])
- local function on_setup()
- command('doautocmd BufEnter x.c')
- end
+ it('with eval', function()
+ call(fn, args..[[, {'eval': 'expand("<afile>")'}]])
+ local function on_setup()
+ command('doautocmd BufEnter x.c')
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq('x.c', arguments[1])
- return ''
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq('x.c', arguments[1])
+ return ''
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
end)
end)
@@ -292,46 +272,77 @@ local function function_specs_for(fn, sync, first_arg_factory, init)
args = args..', "TestFunction"'
end)
- describe('without options', function()
- it('ok', function()
- call(fn, args..', {}')
- local function on_setup()
- if sync then
- eq('rv', eval('TestFunction(1, "a", ["b", "c"])'))
- else
- eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
- end
+ it('without options', function()
+ call(fn, args..', {}')
+ local function on_setup()
+ if sync then
+ eq('rv', eval('TestFunction(1, "a", ["b", "c"])'))
+ else
+ eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
end
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({{1, 'a', {'b', 'c'}}}, arguments)
- return 'rv'
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({{1, 'a', {'b', 'c'}}}, arguments)
+ return 'rv'
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
- describe('with eval', function()
- it('ok', function()
- call(fn, args..[[, {'eval': '2 + 2'}]])
- local function on_setup()
- if sync then
- eq('rv', eval('TestFunction(1, "a", ["b", "c"])'))
- else
- eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
- end
+ it('with eval', function()
+ call(fn, args..[[, {'eval': '2 + 2'}]])
+ local function on_setup()
+ if sync then
+ eq('rv', eval('TestFunction(1, "a", ["b", "c"])'))
+ else
+ eq(1, eval('TestFunction(1, "a", ["b", "c"])'))
end
+ end
- local function handler(method, arguments)
- eq('test-handler', method)
- eq({{1, 'a', {'b', 'c'}}, 4}, arguments)
- return 'rv'
- end
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({{1, 'a', {'b', 'c'}}, 4}, arguments)
+ return 'rv'
+ end
+
+ runx(sync, handler, on_setup)
+ end)
+
+ it('with range', function()
+ helpers.insert([[
+ foo
+ bar
+ baz
+ zub]])
+ call(fn, args..[[, {'range': ''}]])
+ local function on_setup()
+ command('2,3call TestFunction(1, "a", ["b", "c"])')
+ end
+
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({{1, 'a', {'b', 'c'}}, {2, 3}}, arguments)
+ return 'rv'
+ end
+
+ runx(sync, handler, on_setup)
+ end)
+
+ it('with eval/range', function()
+ call(fn, args..[[, {'eval': '4', 'range': ''}]])
+ local function on_setup()
+ command('%call TestFunction(1, "a", ["b", "c"])')
+ end
+
+ local function handler(method, arguments)
+ eq('test-handler', method)
+ eq({{1, 'a', {'b', 'c'}}, {1, 1}, 4}, arguments)
+ return 'rv'
+ end
- runx(sync, handler, on_setup)
- end)
+ runx(sync, handler, on_setup)
end)
end)
end)
diff --git a/test/functional/provider/python_spec.lua b/test/functional/provider/python_spec.lua
index da45d6aa00..06fdbef669 100644
--- a/test/functional/provider/python_spec.lua
+++ b/test/functional/provider/python_spec.lua
@@ -1,12 +1,22 @@
local helpers = require('test.functional.helpers')
-local eval, command, feed = helpers.eval, helpers.command, helpers.feed
-local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert
-local expect, write_file = helpers.expect, helpers.write_file
+
+local eq = helpers.eq
+local neq = helpers.neq
+local feed = helpers.feed
+local clear = helpers.clear
+local funcs = helpers.funcs
+local meths = helpers.meths
+local insert = helpers.insert
+local expect = helpers.expect
+local command = helpers.command
+local exc_exec = helpers.exc_exec
+local write_file = helpers.write_file
+local curbufmeths = helpers.curbufmeths
do
clear()
command('let [g:interp, g:errors] = provider#pythonx#Detect(2)')
- local errors = eval('g:errors')
+ local errors = meths.get_var('errors')
if errors ~= '' then
pending(
'Python 2 (or the Python 2 neovim module) is broken or missing:\n' .. errors,
@@ -15,49 +25,58 @@ do
end
end
-describe('python commands and functions', function()
- before_each(function()
- clear()
- command('python import vim')
- end)
+before_each(function()
+ clear()
+ command('python import vim')
+end)
- it('feature test', function()
- eq(1, eval('has("python")'))
+describe('python feature test', function()
+ it('works', function()
+ eq(1, funcs.has('python'))
end)
+end)
- it('python_execute', function()
+describe(':python command', function()
+ it('works with a line', function()
command('python vim.vars["set_by_python"] = [100, 0]')
- eq({100, 0}, eval('g:set_by_python'))
+ eq({100, 0}, meths.get_var('set_by_python'))
end)
- it('python_execute with nested commands', function()
+ -- TODO(ZyX-I): works with << EOF
+ -- TODO(ZyX-I): works with execute 'python' line1."\n".line2."\n"…
+
+ it('supports nesting', function()
command([[python vim.command('python vim.command("python vim.command(\'let set_by_nested_python = 555\')")')]])
- eq(555, eval('g:set_by_nested_python'))
+ eq(555, meths.get_var('set_by_nested_python'))
end)
- it('python_execute with range', function()
+ it('supports range', function()
insert([[
line1
line2
line3
line4]])
feed('ggjvj:python vim.vars["range"] = vim.current.range[:]<CR>')
- eq({'line2', 'line3'}, eval('g:range'))
+ eq({'line2', 'line3'}, meths.get_var('range'))
end)
+end)
- it('pyfile', function()
+describe(':pyfile command', function()
+ it('works', function()
local fname = 'pyfile.py'
write_file(fname, 'vim.command("let set_by_pyfile = 123")')
command('pyfile pyfile.py')
- eq(123, eval('g:set_by_pyfile'))
+ eq(123, meths.get_var('set_by_pyfile'))
os.remove(fname)
end)
+end)
- it('pydo', function()
+describe(':pydo command', function()
+ it('works', function()
-- :pydo 42 returns None for all lines,
-- the buffer should not be changed
command('normal :pydo 42')
- eq(0, eval('&mod'))
+ eq(false, curbufmeths.get_option('modified'))
-- insert some text
insert('abc\ndef\nghi')
expect([[
@@ -71,8 +90,25 @@ describe('python commands and functions', function()
2
ghi]])
end)
+end)
+
+describe('pyeval()', function()
+ it('works', function()
+ eq({1, 2, {['key'] = 'val'}}, funcs.pyeval('[1, 2, {"key": "val"}]'))
+ end)
+
+ it('errors out when given non-string', function()
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(10)'))
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:_null_dict)'))
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:_null_list)'))
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(0.0)'))
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(function("tr"))'))
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:true)'))
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:false)'))
+ eq('Vim(call):E474: Invalid argument', exc_exec('call pyeval(v:null)'))
+ end)
- it('pyeval', function()
- eq({1, 2, {['key'] = 'val'}}, eval([[pyeval('[1, 2, {"key": "val"}]')]]))
+ it('accepts NULL string', function()
+ neq(0, exc_exec('call pyeval($XXX_NONEXISTENT_VAR_XXX)'))
end)
end)
generated by cgit (git 2.34.1) at 2025-12-30 16:41:12 +0000