Jmaa/assert-gooder
1
0
Fork 0
Code Actions

Better coverage of lvalues.

Browse Source
This commit is contained in:
Jon Michael Aanes 2017-11-02 11:35:49 +01:00
parent 6f3da373f9
commit 8f8a0c8992
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assert-gooder.lua
View File

@ -59,6 +59,10 @@ local function parse (tokens)
left = get_value_token(tokens[1]), left = get_value_token(tokens[1]),
right = get_value_token(tokens[3]) right = get_value_token(tokens[3])
} }
elseif #tokens == 3 and tokens[1].token == 'IDENTIFIER' and tokens[2].token == 'DOT' and tokens[3].token == 'IDENTIFIER' then
return { exp = 'LVALUE', tokens[1].text, { exp = 'STRING', value = tokens[3].text } }
elseif #tokens == 4 and tokens[1].token == 'IDENTIFIER' and tokens[2].token == 'LBRACK' and VALUE_TOKEN[tokens[3].token] and tokens[4].token == 'RBRACK' then
return { exp = 'LVALUE', tokens[1].text, get_value_token(tokens[3]) }
elseif #tokens == 1 then elseif #tokens == 1 then
return get_value_token(tokens[1]) return get_value_token(tokens[1])
else else
@ -151,9 +155,12 @@ local function fmt_val (val)
end end
end end
local function fmt_lvalue (lvalue) local function fmt_lvalue (lvalue, var_scope)
assert(type(lvalue) == 'table' and lvalue.exp == 'LVALUE') assert(type(lvalue) == 'table' and lvalue.exp == 'LVALUE')
return table.concat(lvalue, '.') if #lvalue == 1 then return string.format('%s \'%s\'', var_scope, lvalue[1])
elseif #lvalue == 2 then return string.format('key %s in %s \'%s\'', fmt_val(lvalue[2].value), var_scope, lvalue[1])
else error 'Not implemented yet!'
end
end end
local function get_variable_and_prefix (lvalue, level) local function get_variable_and_prefix (lvalue, level)
@ -161,9 +168,12 @@ local function get_variable_and_prefix (lvalue, level)
assert(type(level) == 'number') assert(type(level) == 'number')
-- --
local base_value, var_scope, in_func = get_variable(lvalue[1], level + 1) local base_value, var_scope, in_func = get_variable(lvalue[1], level + 1)
local value = base_value -- TODO: Generalize to any lvalue -- Determine value of variable
local value = base_value
for i = 2, #lvalue do value = value[lvalue[i].value] end
--
local func_name = in_func and (' to '..get_function_name(debug.getinfo(level + 1))) or '' local func_name = in_func and (' to '..get_function_name(debug.getinfo(level + 1))) or ''
return value, ('assertion failed! bad %s \'%s\'%s'):format(var_scope, fmt_lvalue(lvalue), func_name) return value, ('assertion failed! bad %s%s'):format(fmt_lvalue(lvalue, var_scope), func_name)
end end

16
test/test_assert-gooder.lua
View File

@ -131,6 +131,22 @@ SUITE:addTest('truthy indexing', function ()
assert_equal('./test/test_assert-gooder.lua:'..curline(-2)..': '..'assertion failed! bad key "b" in local \'a\' (truthy expected, but got false)', msg) assert_equal('./test/test_assert-gooder.lua:'..curline(-2)..': '..'assertion failed! bad key "b" in local \'a\' (truthy expected, but got false)', msg)
end) end)
SUITE:addTest('truthy subscript', function ()
local _, msg = pcall(function ()
local a = {}
assert(a[6])
end)
assert_equal('./test/test_assert-gooder.lua:'..curline(-2)..': '..'assertion failed! bad key 6 in local \'a\' (truthy expected, but got nil)', msg)
end)
SUITE:addTest('truthy variable subscript', function ()
local _, msg = pcall(function ()
local a, i = {}, 3
assert(a[i])
end)
assert_equal('./test/test_assert-gooder.lua:'..curline(-2)..': '..'assertion failed! bad key 3 in local \'a\' (truthy expected, but got nil)', msg)
end)
SUITE:addTest('not equal', function (constant_value, msg_in_pars) SUITE:addTest('not equal', function (constant_value, msg_in_pars)
local func = loadstring (("return function() local a = %s; assert(a ~= %s) end"):format(constant_value, constant_value)) () local func = loadstring (("return function() local a = %s; assert(a ~= %s) end"):format(constant_value, constant_value)) ()