Skip to content

Debug module fixes and unit testing #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wledfor2 wants to merge 5 commits into from
Closed

Debug module fixes and unit testing #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7e236b
Fixed an issue causing a NullReferenceException when a Lua type *CAN*…
wledfor2 Oct 8, 2017
deaf641
Merged pull request https://github.com/xanathar/moonsharp/pull/173
wledfor2 Oct 8, 2017
3c096e7
Fixed arguments and return value of debug.setuservalue
wledfor2 Oct 8, 2017
e33dc08
Re-enabled debug module tests
wledfor2 Oct 8, 2017
9f41382
Updated all tap debug tests
wledfor2 Oct 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/MoonSharp.Interpreter.Tests/TapRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public TapRunner(string filename)

public void Run()
{
Script S = new Script();
Script S = new Script(CoreModules.Preset_Complete);

S.Options.DebugPrint = Print;

Expand Down
27 changes: 18 additions & 9 deletions src/MoonSharp.Interpreter.Tests/TestMore/310-debug.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ See "Programming in Lua", section 23 "The Debug Library".

require 'Test.More'

plan(51)
plan(36)

debug = require 'debug'

-- unsupported
--[[
info = debug.getinfo(is)
type_ok(info, 'table', "function getinfo (function)")
is(info.func, is, " .func")
Expand All @@ -56,7 +58,6 @@ error_like(function () debug.getinfo('bad') end,
error_like(function () debug.getinfo(is, 'X') end,
"bad argument #2 to 'getinfo' %(invalid option%)",
"function getinfo (bad opt)")

local name, value = debug.getlocal(0, 1)
type_ok(name, 'string', "function getlocal (level)")
is(value, 0)
Expand All @@ -68,6 +69,7 @@ error_like(function () debug.getlocal(42, 1) end,
local name, value = debug.getlocal(like, 1)
type_ok(name, 'string', "function getlocal (func)")
is(value, nil)
--]]

t = {}
is(debug.getmetatable(t), nil, "function getmetatable")
Expand All @@ -85,13 +87,16 @@ is(debug.getmetatable(a), nil)
debug.setmetatable(a, t1)
is(debug.getmetatable(t), t1)

-- F61E3AA7247D4D1EB7A45430B0C8C9BB_MATH_RANDOM seems to be the only registry key used by MoonSharp
local reg = debug.getregistry()
type_ok(reg, 'table', "function getregistry")
type_ok(reg._LOADED, 'table')
type_ok(reg["F61E3AA7247D4D1EB7A45430B0C8C9BB_MATH_RANDOM"], 'userdata')

local name = debug.getupvalue(plan, 1)
type_ok(name, 'string', "function getupvalue")

-- unsupported
--[[
debug.sethook()
hook, mask, count = debug.gethook()
is(hook, nil, "function gethook")
Expand Down Expand Up @@ -120,14 +125,15 @@ is(name, nil, "function setlocal (level)")
error_like(function () debug.setlocal(42, 1, true) end,
"bad argument #1 to 'setlocal' %(level out of range%)",
"function getlocal (out of range)")
--]]

t = {}
t1 = {}
is(debug.setmetatable(t, t1), t, "function setmetatable")
is(getmetatable(t), t1)
is(debug.getmetatable(t), t1)

error_like(function () debug.setmetatable(t, true) end,
"^[^:]+:%d+: bad argument #2 to 'setmetatable' %(nil or table expected%)")
"^[^:]+:%d+: bad argument #2 to 'setmetatable' %(nil or table expected, got boolean%)")

local name = debug.setupvalue(plan, 1, require 'Test.Builder':new())
type_ok(name, 'string', "function setupvalue")
Expand All @@ -143,27 +149,30 @@ else
is(old, nil, "function getuservalue")
end
is(debug.getuservalue(true), nil)

local data = {}
r = debug.setuservalue(u, data)
is(r, u, "function setuservalue")
is(debug.getuservalue(u), data)
r = debug.setuservalue(u, old)
is(debug.getuservalue(u), old)

-- bad argument #2 to 'setuservalue' (nil or table expected, got boolean)
error_like(function () debug.setuservalue({}, data) end,
"^[^:]+:%d+: bad argument #1 to 'setuservalue' %(userdata expected, got table%)")

error_like(function () debug.setuservalue(u, true) end,
"^[^:]+:%d+: bad argument #2 to 'setuservalue' %(table expected, got boolean%)")
"^[^:]+:%d+: bad argument #2 to 'setuservalue' %(nil or table expected, got boolean%)")

like(debug.traceback(), "^stack traceback:\n", "function traceback")
like(debug.traceback(), "^stack traceback:", "function traceback")

like(debug.traceback("message\n"), "^message\n\nstack traceback:\n", "function traceback with message")
like(debug.traceback("message"), "^message", "function traceback with message")

like(debug.traceback(false), "false", "function traceback")

-- debug.upvalueid returns number instead of userdata as per implementation
local id = debug.upvalueid(plan, 1)
type_ok(id, 'userdata', "function upvalueid")
type_ok(id, 'number', "function upvalueid")

debug.upvaluejoin (pass, 1, fail, 1)

Expand Down
10 changes: 5 additions & 5 deletions src/MoonSharp.Interpreter.Tests/TestMoreTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,12 @@ public void TestMore_309_os()
}


//[Test]
[Test]
//[Ignore]
//public void TestMore_310_debug()
//{
// TapRunner.Run(@"TestMore/310-debug.t");
//}
public void TestMore_310_debug()
{
TapRunner.Run(@"TestMore/310-debug.t");
}


[Test]
Expand Down
27 changes: 18 additions & 9 deletions ...er.Tests/_Projects/MoonSharp.Interpreter.Tests.Embeddable.portable40/TestMore/310-debug.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ See "Programming in Lua", section 23 "The Debug Library".

require 'Test.More'

plan(51)
plan(36)

debug = require 'debug'

-- unsupported
--[[
info = debug.getinfo(is)
type_ok(info, 'table', "function getinfo (function)")
is(info.func, is, " .func")
Expand All @@ -56,7 +58,6 @@ error_like(function () debug.getinfo('bad') end,
error_like(function () debug.getinfo(is, 'X') end,
"bad argument #2 to 'getinfo' %(invalid option%)",
"function getinfo (bad opt)")

local name, value = debug.getlocal(0, 1)
type_ok(name, 'string', "function getlocal (level)")
is(value, 0)
Expand All @@ -68,6 +69,7 @@ error_like(function () debug.getlocal(42, 1) end,
local name, value = debug.getlocal(like, 1)
type_ok(name, 'string', "function getlocal (func)")
is(value, nil)
--]]

t = {}
is(debug.getmetatable(t), nil, "function getmetatable")
Expand All @@ -85,13 +87,16 @@ is(debug.getmetatable(a), nil)
debug.setmetatable(a, t1)
is(debug.getmetatable(t), t1)

-- F61E3AA7247D4D1EB7A45430B0C8C9BB_MATH_RANDOM seems to be the only registry key used by MoonSharp
local reg = debug.getregistry()
type_ok(reg, 'table', "function getregistry")
type_ok(reg._LOADED, 'table')
type_ok(reg["F61E3AA7247D4D1EB7A45430B0C8C9BB_MATH_RANDOM"], 'userdata')

local name = debug.getupvalue(plan, 1)
type_ok(name, 'string', "function getupvalue")

-- unsupported
--[[
debug.sethook()
hook, mask, count = debug.gethook()
is(hook, nil, "function gethook")
Expand Down Expand Up @@ -120,14 +125,15 @@ is(name, nil, "function setlocal (level)")
error_like(function () debug.setlocal(42, 1, true) end,
"bad argument #1 to 'setlocal' %(level out of range%)",
"function getlocal (out of range)")
--]]

t = {}
t1 = {}
is(debug.setmetatable(t, t1), t, "function setmetatable")
is(getmetatable(t), t1)
is(debug.getmetatable(t), t1)

error_like(function () debug.setmetatable(t, true) end,
"^[^:]+:%d+: bad argument #2 to 'setmetatable' %(nil or table expected%)")
"^[^:]+:%d+: bad argument #2 to 'setmetatable' %(nil or table expected, got boolean%)")

local name = debug.setupvalue(plan, 1, require 'Test.Builder':new())
type_ok(name, 'string', "function setupvalue")
Expand All @@ -143,27 +149,30 @@ else
is(old, nil, "function getuservalue")
end
is(debug.getuservalue(true), nil)

local data = {}
r = debug.setuservalue(u, data)
is(r, u, "function setuservalue")
is(debug.getuservalue(u), data)
r = debug.setuservalue(u, old)
is(debug.getuservalue(u), old)

-- bad argument #2 to 'setuservalue' (nil or table expected, got boolean)
error_like(function () debug.setuservalue({}, data) end,
"^[^:]+:%d+: bad argument #1 to 'setuservalue' %(userdata expected, got table%)")

error_like(function () debug.setuservalue(u, true) end,
"^[^:]+:%d+: bad argument #2 to 'setuservalue' %(table expected, got boolean%)")
"^[^:]+:%d+: bad argument #2 to 'setuservalue' %(nil or table expected, got boolean%)")

like(debug.traceback(), "^stack traceback:\n", "function traceback")
like(debug.traceback(), "^stack traceback:", "function traceback")

like(debug.traceback("message\n"), "^message\n\nstack traceback:\n", "function traceback with message")
like(debug.traceback("message"), "^message", "function traceback with message")

like(debug.traceback(false), "false", "function traceback")

-- debug.upvalueid returns number instead of userdata as per implementation
local id = debug.upvalueid(plan, 1)
type_ok(id, 'userdata', "function upvalueid")
type_ok(id, 'number', "function upvalueid")

debug.upvaluejoin (pass, 1, fail, 1)

Expand Down
27 changes: 18 additions & 9 deletions ...Interpreter.Tests/_Projects/MoonSharp.Interpreter.Tests.net40-client/TestMore/310-debug.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ See "Programming in Lua", section 23 "The Debug Library".

require 'Test.More'

plan(51)
plan(36)

debug = require 'debug'

-- unsupported
--[[
info = debug.getinfo(is)
type_ok(info, 'table', "function getinfo (function)")
is(info.func, is, " .func")
Expand All @@ -56,7 +58,6 @@ error_like(function () debug.getinfo('bad') end,
error_like(function () debug.getinfo(is, 'X') end,
"bad argument #2 to 'getinfo' %(invalid option%)",
"function getinfo (bad opt)")

local name, value = debug.getlocal(0, 1)
type_ok(name, 'string', "function getlocal (level)")
is(value, 0)
Expand All @@ -68,6 +69,7 @@ error_like(function () debug.getlocal(42, 1) end,
local name, value = debug.getlocal(like, 1)
type_ok(name, 'string', "function getlocal (func)")
is(value, nil)
--]]

t = {}
is(debug.getmetatable(t), nil, "function getmetatable")
Expand All @@ -85,13 +87,16 @@ is(debug.getmetatable(a), nil)
debug.setmetatable(a, t1)
is(debug.getmetatable(t), t1)

-- F61E3AA7247D4D1EB7A45430B0C8C9BB_MATH_RANDOM seems to be the only registry key used by MoonSharp
local reg = debug.getregistry()
type_ok(reg, 'table', "function getregistry")
type_ok(reg._LOADED, 'table')
type_ok(reg["F61E3AA7247D4D1EB7A45430B0C8C9BB_MATH_RANDOM"], 'userdata')

local name = debug.getupvalue(plan, 1)
type_ok(name, 'string', "function getupvalue")

-- unsupported
--[[
debug.sethook()
hook, mask, count = debug.gethook()
is(hook, nil, "function gethook")
Expand Down Expand Up @@ -120,14 +125,15 @@ is(name, nil, "function setlocal (level)")
error_like(function () debug.setlocal(42, 1, true) end,
"bad argument #1 to 'setlocal' %(level out of range%)",
"function getlocal (out of range)")
--]]

t = {}
t1 = {}
is(debug.setmetatable(t, t1), t, "function setmetatable")
is(getmetatable(t), t1)
is(debug.getmetatable(t), t1)

error_like(function () debug.setmetatable(t, true) end,
"^[^:]+:%d+: bad argument #2 to 'setmetatable' %(nil or table expected%)")
"^[^:]+:%d+: bad argument #2 to 'setmetatable' %(nil or table expected, got boolean%)")

local name = debug.setupvalue(plan, 1, require 'Test.Builder':new())
type_ok(name, 'string', "function setupvalue")
Expand All @@ -143,27 +149,30 @@ else
is(old, nil, "function getuservalue")
end
is(debug.getuservalue(true), nil)

local data = {}
r = debug.setuservalue(u, data)
is(r, u, "function setuservalue")
is(debug.getuservalue(u), data)
r = debug.setuservalue(u, old)
is(debug.getuservalue(u), old)

-- bad argument #2 to 'setuservalue' (nil or table expected, got boolean)
error_like(function () debug.setuservalue({}, data) end,
"^[^:]+:%d+: bad argument #1 to 'setuservalue' %(userdata expected, got table%)")

error_like(function () debug.setuservalue(u, true) end,
"^[^:]+:%d+: bad argument #2 to 'setuservalue' %(table expected, got boolean%)")
"^[^:]+:%d+: bad argument #2 to 'setuservalue' %(nil or table expected, got boolean%)")

like(debug.traceback(), "^stack traceback:\n", "function traceback")
like(debug.traceback(), "^stack traceback:", "function traceback")

like(debug.traceback("message\n"), "^message\n\nstack traceback:\n", "function traceback with message")
like(debug.traceback("message"), "^message", "function traceback with message")

like(debug.traceback(false), "false", "function traceback")

-- debug.upvalueid returns number instead of userdata as per implementation
local id = debug.upvalueid(plan, 1)
type_ok(id, 'userdata', "function upvalueid")
type_ok(id, 'number', "function upvalueid")

debug.upvaluejoin (pass, 1, fail, 1)

Expand Down
Loading