diff options
| -rw-r--r-- | test/functional/api/vim_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/eval/json_functions_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/eval/special_vars_spec.lua | 14 | ||||
| -rw-r--r-- | test/functional/eval/string_spec.lua | 3 | ||||
| -rw-r--r-- | test/functional/plugin/msgpack_spec.lua | 4 |
5 files changed, 15 insertions, 12 deletions
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua index d7faaa9d2d..389badb423 100644 --- a/test/functional/api/vim_spec.lua +++ b/test/functional/api/vim_spec.lua @@ -92,7 +92,7 @@ describe('vim_* functions', function() it('del_var returns the old value', function() local val1 = {1, 2, {['3'] = 1}} local val2 = {4, 7} - eq(nil, meths.set_var('lua', val1)) + eq(NIL, meths.set_var('lua', val1)) eq(val1, meths.set_var('lua', val2)) eq(val2, meths.del_var('lua')) end) diff --git a/test/functional/eval/json_functions_spec.lua b/test/functional/eval/json_functions_spec.lua index 0a7c4cf669..1cece78ce1 100644 --- a/test/functional/eval/json_functions_spec.lua +++ b/test/functional/eval/json_functions_spec.lua @@ -79,7 +79,7 @@ describe('json_decode() function', function() end) it('parses null, true, false', function() - eq(nil, funcs.json_decode('null')) + eq(NIL, funcs.json_decode('null')) eq(true, funcs.json_decode('true')) eq(false, funcs.json_decode('false')) end) @@ -309,7 +309,7 @@ describe('json_decode() function', function() it('parses containers', function() eq({1}, funcs.json_decode('[1]')) - eq({nil, 1}, funcs.json_decode('[null, 1]')) + eq({NIL, 1}, funcs.json_decode('[null, 1]')) eq({['1']=2}, funcs.json_decode('{"1": 2}')) eq({['1']=2, ['3']={{['4']={['5']={{}, 1}}}}}, funcs.json_decode('{"1": 2, "3": [{"4": {"5": [[], 1]}}]}')) diff --git a/test/functional/eval/special_vars_spec.lua b/test/functional/eval/special_vars_spec.lua index b003dceb04..6ab4e6a7d7 100644 --- a/test/functional/eval/special_vars_spec.lua +++ b/test/functional/eval/special_vars_spec.lua @@ -27,13 +27,13 @@ describe('Special values', function() it('work with empty()', function() eq(0, funcs.empty(true)) eq(1, funcs.empty(false)) - eq(1, eval('empty(v:null)')) + eq(1, funcs.empty(NIL)) end) it('can be stringified and eval’ed back', function() eq(true, funcs.eval(funcs.string(true))) eq(false, funcs.eval(funcs.string(false))) - eq(nil, eval('eval(string(v:null))')) + eq(NIL, funcs.eval(funcs.string(NIL))) end) it('work with is/isnot properly', function() @@ -133,17 +133,17 @@ describe('Special values', function() it('work with type()', function() eq(6, funcs.type(true)) eq(6, funcs.type(false)) - eq(7, eval('type(v:null)')) + eq(7, funcs.type(NIL)) end) it('work with copy() and deepcopy()', function() eq(true, funcs.deepcopy(true)) eq(false, funcs.deepcopy(false)) - eq(nil, eval('deepcopy(v:null)')) + eq(NIL, funcs.deepcopy(NIL)) eq(true, funcs.copy(true)) eq(false, funcs.copy(false)) - eq(nil, eval('copy(v:null)')) + eq(NIL, funcs.copy(NIL)) end) it('fails in index', function() @@ -155,11 +155,11 @@ describe('Special values', function() it('is accepted by assert_true and assert_false', function() funcs.assert_false(false) funcs.assert_false(true) - eval('assert_false(v:null)') + funcs.assert_false(NIL) funcs.assert_true(false) funcs.assert_true(true) - eval('assert_true(v:null)') + funcs.assert_true(NIL) eq({ 'Expected False but got v:true', diff --git a/test/functional/eval/string_spec.lua b/test/functional/eval/string_spec.lua index 20a800cde0..0fd7587edb 100644 --- a/test/functional/eval/string_spec.lua +++ b/test/functional/eval/string_spec.lua @@ -32,6 +32,9 @@ describe('string() function', function() eq('v:true', eval('string(v:true)')) eq('v:false', eval('string(v:false)')) eq('v:null', eval('string(v:null)')) + eq('v:true', funcs.string(true)) + eq('v:false', funcs.string(false)) + eq('v:null', funcs.string(NIL)) end) it('dumps values with at most six digits after the decimal point', diff --git a/test/functional/plugin/msgpack_spec.lua b/test/functional/plugin/msgpack_spec.lua index 197a1a92e5..246b26188f 100644 --- a/test/functional/plugin/msgpack_spec.lua +++ b/test/functional/plugin/msgpack_spec.lua @@ -534,7 +534,7 @@ describe('In autoload/msgpack.vim', function() it('works for special v: values like v:true', function() meths.set_var('true', true) meths.set_var('false', false) - nvim_command('let nil = v:null') + meths.set_var('nil', NIL) nvim_command('let true2 = msgpack#deepcopy(true)') nvim_command('let false2 = msgpack#deepcopy(false)') @@ -542,7 +542,7 @@ describe('In autoload/msgpack.vim', function() eq(true, meths.get_var('true')) eq(false, meths.get_var('false')) - eq(nil, meths.get_var('nil')) + eq(NIL, meths.get_var('nil')) end) end) |