mirror of
https://github.com/rayaman/multi.git
synced 2026-09-05 07:27:35 -04:00
Improving tests
This commit is contained in:
+208
-132
@@ -1,9 +1,74 @@
|
||||
package.path = "../?/init.lua;../?.lua;./init.lua;./?.lua;"..package.path
|
||||
package.path = "../?/init.lua;../?.lua;./init.lua;./?.lua;" .. package.path
|
||||
|
||||
local multi, thread = require("multi"):init{print=true,warn=true,error=true}--{priority=true}
|
||||
local good = false
|
||||
local proc = multi:newProcessor("Test")
|
||||
|
||||
local testing = {}
|
||||
|
||||
function testing.False(value)
|
||||
if value ~= false then
|
||||
thread.kill("Expected value to be false")
|
||||
end
|
||||
end
|
||||
|
||||
function testing.True(value)
|
||||
if value ~= true then
|
||||
thread.kill("Expected value to be true")
|
||||
end
|
||||
end
|
||||
|
||||
function testing.IsNil(value)
|
||||
if value ~= nil then
|
||||
thread.kill("Expected nil, but got: " .. tostring(value) .."")
|
||||
end
|
||||
end
|
||||
|
||||
function testing.NotNil(value)
|
||||
if value == nil then
|
||||
thread.kill("Expected value not to be nil.")
|
||||
end
|
||||
end
|
||||
|
||||
function testing.Equal(expected, actual)
|
||||
if expected ~= actual then
|
||||
thread.kill("Not equal: \n" ..
|
||||
"expected: " .. tostring(expected) .. "\n" ..
|
||||
"actual : " .. tostring(actual) .. "\n")
|
||||
end
|
||||
end
|
||||
|
||||
function testing.NotEqual(expected, actual)
|
||||
if expected == actual then
|
||||
thread.kill("Should not be: values are equal")
|
||||
end
|
||||
end
|
||||
|
||||
function getOS()
|
||||
-- ask LuaJIT first
|
||||
if jit then
|
||||
return jit.os
|
||||
end
|
||||
|
||||
-- Unix, Linux variants
|
||||
local fh,err = assert(io.popen("uname -o 2>/dev/null","r"))
|
||||
if fh then
|
||||
osname = fh:read()
|
||||
end
|
||||
|
||||
return osname or "Windows"
|
||||
end
|
||||
|
||||
function ListFiles(path)
|
||||
files = {}
|
||||
if getOS() == "Windows" then
|
||||
for dir in io.popen([[dir /A-d "]] .. path .. [[" /b]]):lines() do table.insert(files,dir) end
|
||||
else
|
||||
for dir in io.popen([[ls -pa "]] .. path .. [[" | grep -v /]]):lines() do table.insert(files,dir) end
|
||||
end
|
||||
return files
|
||||
end
|
||||
|
||||
print("Version: "..multi.Version)
|
||||
|
||||
proc.Start()
|
||||
@@ -13,147 +78,158 @@ proc:newAlarm(3):OnRing(function()
|
||||
end)
|
||||
|
||||
runTest = thread:newFunction(function()
|
||||
local alarms,tsteps,steps,loops,tloops,updaters,events=false,0,0,0,0,0,false
|
||||
multi.print("Testing Basic Features. If this fails most other features will probably not work!")
|
||||
proc:newAlarm(2):OnRing(function(a)
|
||||
alarms = true
|
||||
a:Destroy()
|
||||
end)
|
||||
proc:newTStep(1,10,1,.1):OnStep(function(t)
|
||||
tsteps = tsteps + 1
|
||||
end):OnEnd(function(step)
|
||||
step:Destroy()
|
||||
end)
|
||||
proc:newStep(1,10):OnStep(function(s)
|
||||
steps = steps + 1
|
||||
end):OnEnd(function(step)
|
||||
step:Destroy()
|
||||
end)
|
||||
local loop = proc:newLoop(function(l)
|
||||
loops = loops + 1
|
||||
end)
|
||||
proc:newTLoop(function(t)
|
||||
tloops = tloops + 1
|
||||
end,.1)
|
||||
local updater = proc:newUpdater(1):OnUpdate(function()
|
||||
updaters = updaters + 1
|
||||
end)
|
||||
local event = proc:newEvent(function()
|
||||
return alarms
|
||||
end)
|
||||
event.OnEvent(function(evnt)
|
||||
evnt:Destroy()
|
||||
events = true
|
||||
multi.success("Alarms: Ok")
|
||||
multi.success("Events: Ok")
|
||||
if tsteps == 10 then multi.success("TSteps: Ok") else multi.error("TSteps: Bad!") end
|
||||
if steps == 10 then multi.success("Steps: Ok") else multi.error("Steps: Bad!") end
|
||||
if loops > 100 then multi.success("Loops: Ok") else multi.error("Loops: Bad!") end
|
||||
if tloops > 10 then multi.success("TLoops: Ok") else multi.error("TLoops: Bad!") end
|
||||
if updaters > 100 then multi.success("Updaters: Ok") else multi.error("Updaters: Bad!") end
|
||||
end)
|
||||
thread.hold(event.OnEvent)
|
||||
multi.print("Starting Connection and Thread tests!")
|
||||
func = thread:newFunction(function(count)
|
||||
multi.print("Starting Status test: ",count)
|
||||
local a = 0
|
||||
while true do
|
||||
a = a + 1
|
||||
thread.sleep(.1)
|
||||
thread.pushStatus(a,count)
|
||||
if a == count then break end
|
||||
end
|
||||
return "Done", true, math.random(1,10000)
|
||||
end)
|
||||
local ret = func(10)
|
||||
local ret2 = func(15)
|
||||
local ret3 = func(20)
|
||||
local s1,s2,s3 = 0,0,0
|
||||
ret.OnError(function(...)
|
||||
multi.error("Func 1:",...)
|
||||
end)
|
||||
ret2.OnError(function(...)
|
||||
multi.error("Func 2:",...)
|
||||
end)
|
||||
ret3.OnError(function(...)
|
||||
multi.error("Func 3:",...)
|
||||
end)
|
||||
ret.OnStatus(function(part,whole)
|
||||
s1 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
ret2.OnStatus(function(part,whole)
|
||||
s2 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
ret3.OnStatus(function(part,whole)
|
||||
s3 = math.ceil((part/whole)*1000)/10
|
||||
end)
|
||||
-- local alarms,tsteps,steps,loops,tloops,updaters,events=false,0,0,0,0,0,false
|
||||
-- multi.print("Testing Basic Features. If this fails most other features will probably not work!")
|
||||
-- proc:newAlarm(2):OnRing(function(a)
|
||||
-- alarms = true
|
||||
-- a:Destroy()
|
||||
-- end)
|
||||
-- proc:newTStep(1,10,1,.1):OnStep(function(t)
|
||||
-- tsteps = tsteps + 1
|
||||
-- end):OnEnd(function(step)
|
||||
-- step:Destroy()
|
||||
-- end)
|
||||
-- proc:newStep(1,10):OnStep(function(s)
|
||||
-- steps = steps + 1
|
||||
-- end):OnEnd(function(step)
|
||||
-- step:Destroy()
|
||||
-- end)
|
||||
-- local loop = proc:newLoop(function(l)
|
||||
-- loops = loops + 1
|
||||
-- end)
|
||||
-- proc:newTLoop(function(t)
|
||||
-- tloops = tloops + 1
|
||||
-- end,.1)
|
||||
-- local updater = proc:newUpdater(1):OnUpdate(function()
|
||||
-- updaters = updaters + 1
|
||||
-- end)
|
||||
-- local event = proc:newEvent(function()
|
||||
-- return alarms
|
||||
-- end)
|
||||
-- event.OnEvent(function(evnt)
|
||||
-- evnt:Destroy()
|
||||
-- events = true
|
||||
-- multi.success("Alarms: Ok")
|
||||
-- multi.success("Events: Ok")
|
||||
-- if tsteps == 10 then multi.success("TSteps: Ok") else multi.error("TSteps: Bad!") end
|
||||
-- if steps == 10 then multi.success("Steps: Ok") else multi.error("Steps: Bad!") end
|
||||
-- if loops > 100 then multi.success("Loops: Ok") else multi.error("Loops: Bad!") end
|
||||
-- if tloops > 10 then multi.success("TLoops: Ok") else multi.error("TLoops: Bad!") end
|
||||
-- if updaters > 100 then multi.success("Updaters: Ok") else multi.error("Updaters: Bad!") end
|
||||
-- end)
|
||||
-- thread.hold(event.OnEvent)
|
||||
-- multi.print("Starting Connection and Thread tests!")
|
||||
-- func = thread:newFunction(function(count)
|
||||
-- multi.print("Starting Status test: ",count)
|
||||
-- local a = 0
|
||||
-- while true do
|
||||
-- a = a + 1
|
||||
-- thread.sleep(.1)
|
||||
-- thread.pushStatus(a,count)
|
||||
-- if a == count then break end
|
||||
-- end
|
||||
-- return "Done", true, math.random(1,10000)
|
||||
-- end)
|
||||
-- local ret = func(10)
|
||||
-- local ret2 = func(15)
|
||||
-- local ret3 = func(20)
|
||||
-- local s1,s2,s3 = 0,0,0
|
||||
-- ret.OnError(function(...)
|
||||
-- multi.error("Func 1:",...)
|
||||
-- end)
|
||||
-- ret2.OnError(function(...)
|
||||
-- multi.error("Func 2:",...)
|
||||
-- end)
|
||||
-- ret3.OnError(function(...)
|
||||
-- multi.error("Func 3:",...)
|
||||
-- end)
|
||||
-- ret.OnStatus(function(part,whole)
|
||||
-- s1 = math.ceil((part/whole)*1000)/10
|
||||
-- end)
|
||||
-- ret2.OnStatus(function(part,whole)
|
||||
-- s2 = math.ceil((part/whole)*1000)/10
|
||||
-- end)
|
||||
-- ret3.OnStatus(function(part,whole)
|
||||
-- s3 = math.ceil((part/whole)*1000)/10
|
||||
-- end)
|
||||
|
||||
ret.OnReturn(function(...)
|
||||
multi.success("Done 1",...)
|
||||
end)
|
||||
ret2.OnReturn(function(...)
|
||||
multi.success("Done 2",...)
|
||||
end)
|
||||
ret3.OnReturn(function(...)
|
||||
multi.success("Done 3",...)
|
||||
end)
|
||||
-- ret.OnReturn(function(...)
|
||||
-- multi.success("Done 1",...)
|
||||
-- end)
|
||||
-- ret2.OnReturn(function(...)
|
||||
-- multi.success("Done 2",...)
|
||||
-- end)
|
||||
-- ret3.OnReturn(function(...)
|
||||
-- multi.success("Done 3",...)
|
||||
-- end)
|
||||
|
||||
local err, timeout = thread.hold(ret.OnReturn * ret2.OnReturn * ret3.OnReturn)
|
||||
-- local err, timeout = thread.hold(ret.OnReturn * ret2.OnReturn * ret3.OnReturn)
|
||||
|
||||
if s1 == 100 and s2 == 100 and s3 == 100 then
|
||||
multi.success("Threads: All tests Ok")
|
||||
else
|
||||
if s1>0 and s2>0 and s3 > 0 then
|
||||
multi.success("Thread OnStatus: Ok")
|
||||
else
|
||||
multi.error("Threads OnStatus or thread.hold(conn) Error!")
|
||||
end
|
||||
if timeout then
|
||||
multi.error("Connection Error!")
|
||||
else
|
||||
multi.success("Connection Test 1: Ok")
|
||||
end
|
||||
multi.error("Connection holding Error!")
|
||||
end
|
||||
-- if s1 == 100 and s2 == 100 and s3 == 100 then
|
||||
-- multi.success("Threads: All tests Ok")
|
||||
-- else
|
||||
-- if s1>0 and s2>0 and s3 > 0 then
|
||||
-- multi.success("Thread OnStatus: Ok")
|
||||
-- else
|
||||
-- multi.error("Threads OnStatus or thread.hold(conn) Error!")
|
||||
-- end
|
||||
-- if timeout then
|
||||
-- multi.error("Connection Error!")
|
||||
-- else
|
||||
-- multi.success("Connection Test 1: Ok")
|
||||
-- end
|
||||
-- multi.error("Connection holding Error!")
|
||||
-- end
|
||||
|
||||
conn1 = proc:newConnection()
|
||||
conn2 = proc:newConnection()
|
||||
conn3 = proc:newConnection()
|
||||
local c1,c2,c3,c4 = false,false,false,false
|
||||
-- conn1 = proc:newConnection()
|
||||
-- conn2 = proc:newConnection()
|
||||
-- conn3 = proc:newConnection()
|
||||
-- local c1,c2,c3,c4 = false,false,false,false
|
||||
|
||||
local a = conn1(function()
|
||||
c1 = true
|
||||
end)
|
||||
-- local a = conn1(function()
|
||||
-- c1 = true
|
||||
-- end)
|
||||
|
||||
local b = conn2(function()
|
||||
c2 = true
|
||||
end)
|
||||
-- local b = conn2(function()
|
||||
-- c2 = true
|
||||
-- end)
|
||||
|
||||
local c = conn3(function()
|
||||
c3 = true
|
||||
end)
|
||||
-- local c = conn3(function()
|
||||
-- c3 = true
|
||||
-- end)
|
||||
|
||||
local d = conn3(function()
|
||||
c4 = true
|
||||
end)
|
||||
-- local d = conn3(function()
|
||||
-- c4 = true
|
||||
-- end)
|
||||
|
||||
conn1:Fire()
|
||||
conn2:Fire()
|
||||
conn3:Fire()
|
||||
-- conn1:Fire()
|
||||
-- conn2:Fire()
|
||||
-- conn3:Fire()
|
||||
|
||||
if c1 and c2 and c3 and c4 then
|
||||
multi.success("Connection Test 2: Ok")
|
||||
else
|
||||
multi.error("Connection Test 2: Error")
|
||||
end
|
||||
c3 = false
|
||||
c4 = false
|
||||
conn3:Unconnect(d)
|
||||
conn3:Fire()
|
||||
if c3 and not(c4) then
|
||||
multi.success("Connection Test 3: Ok")
|
||||
else
|
||||
multi.error("Connection Test 3: Error removing connection")
|
||||
-- if c1 and c2 and c3 and c4 then
|
||||
-- multi.success("Connection Test 2: Ok")
|
||||
-- else
|
||||
-- multi.error("Connection Test 2: Error")
|
||||
-- end
|
||||
-- c3 = false
|
||||
-- c4 = false
|
||||
-- conn3:Unconnect(d)
|
||||
-- conn3:Fire()
|
||||
-- if c3 and not(c4) then
|
||||
-- multi.success("Connection Test 3: Ok")
|
||||
-- else
|
||||
-- multi.error("Connection Test 3: Error removing connection")
|
||||
-- end
|
||||
units = ListFiles("tests/units")
|
||||
for _, file in pairs(units) do
|
||||
multi.print("Running tests in: " .. file)
|
||||
unit = loadfile("tests/units/" .. file)()
|
||||
function Test(...)
|
||||
unit.Test(...)
|
||||
multi.success(file)
|
||||
end
|
||||
func = thread:newFunction(Test, true)
|
||||
func(multi:newProcessor(file), thread, testing)
|
||||
end
|
||||
if not love then
|
||||
local ec = 0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package.path = "D:/VSCWorkspace/?/init.lua;D:/VSCWorkspace/?.lua;"..package.path
|
||||
package.path = "../?/init.lua;../?.lua;./init.lua;./?.lua;" .. package.path
|
||||
package.cpath = "C:/luaInstalls/lua5.4/lib/lua/5.4/?/core.dll;" .. package.cpath
|
||||
multi, thread = require("multi"):init{error=true,warning=true,print=true, priority=true}
|
||||
proc = multi:newProcessor("Thread Test",true)
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
function Test(multi, thread, t)
|
||||
multi.print("Testing Connection operators")
|
||||
|
||||
do
|
||||
multi.print("Testing: conn1 + conn2")
|
||||
local conn1 = multi:newConnection()
|
||||
local conn2 = multi:newConnection()
|
||||
local conn3 = conn1 + conn2
|
||||
local count = 0
|
||||
|
||||
conn3(function()
|
||||
count = count + 1
|
||||
end)
|
||||
|
||||
conn1:Fire()
|
||||
t.Equal(1, count)
|
||||
conn2:Fire()
|
||||
t.Equal(2, count)
|
||||
end
|
||||
|
||||
do
|
||||
multi.print("Testing: conn1 * conn2")
|
||||
local conn1 = multi:newConnection()
|
||||
local conn2 = multi:newConnection()
|
||||
local conn3 = conn1 * conn2
|
||||
local count = 0
|
||||
|
||||
conn3(function()
|
||||
count = count + 1
|
||||
end)
|
||||
|
||||
conn1:Fire()
|
||||
t.Equal(0, count)
|
||||
conn2:Fire()
|
||||
t.Equal(1, count)
|
||||
end
|
||||
|
||||
do
|
||||
multi.print("Testing: conn .. function")
|
||||
local called = false
|
||||
local conn1 = multi:newConnection()
|
||||
local conn2 = conn1 .. function() called = true end
|
||||
|
||||
conn1(function()
|
||||
t.False(called)
|
||||
end)
|
||||
|
||||
conn2:Fire()
|
||||
t.True(called)
|
||||
end
|
||||
|
||||
do
|
||||
multi.print("function .. conn")
|
||||
local status = false
|
||||
local conn1 = multi:newConnection()
|
||||
local conn2 = function(test) return test end .. conn1
|
||||
|
||||
conn1(function()
|
||||
status = true
|
||||
end)
|
||||
|
||||
conn2:Fire(false)
|
||||
t.False(status)
|
||||
conn2:Fire(true)
|
||||
t.True(status)
|
||||
end
|
||||
end
|
||||
|
||||
return {
|
||||
Test = Test
|
||||
}
|
||||
Reference in New Issue
Block a user