mirror of
https://github.com/MikaylaFischler/cc-mek-scada.git
synced 2024-08-30 18:22:34 +00:00
#9 rsio test code, fixes per test results
This commit is contained in:
parent
a93f0a4452
commit
9fb6b7a880
@ -101,7 +101,7 @@ rsio.to_string = function (channel)
|
||||
"R_PLC_TIMEOUT"
|
||||
}
|
||||
|
||||
if channel > 0 and channel <= #names then
|
||||
if type(channel) == "number" and channel > 0 and channel <= #names then
|
||||
return names[channel]
|
||||
else
|
||||
return ""
|
||||
@ -188,7 +188,7 @@ rsio.get_io_mode = function (channel)
|
||||
IO_MODE.DIGITAL_OUT -- R_PLC_TIMEOUT
|
||||
}
|
||||
|
||||
if channel > 0 and channel <= #modes then
|
||||
if type(channel) == "number" and channel > 0 and channel <= #modes then
|
||||
return modes[channel]
|
||||
else
|
||||
return IO_MODE.ANALOG_IN
|
||||
@ -205,7 +205,7 @@ local RS_SIDES = rs.getSides()
|
||||
---@param channel RS_IO
|
||||
---@return boolean valid
|
||||
rsio.is_valid_channel = function (channel)
|
||||
return (channel ~= nil) and (channel > 0) and (channel <= RS_IO.R_PLC_TIMEOUT)
|
||||
return (type(channel) == "number") and (channel > 0) and (channel <= RS_IO.R_PLC_TIMEOUT)
|
||||
end
|
||||
|
||||
-- check if a side is valid
|
||||
@ -224,7 +224,7 @@ end
|
||||
---@param color integer
|
||||
---@return boolean valid
|
||||
rsio.is_color = function (color)
|
||||
return (color > 0) and (_B_AND(color, (color - 1)) == 0);
|
||||
return (type(color) == "number") and (color > 0) and (_B_AND(color, (color - 1)) == 0);
|
||||
end
|
||||
|
||||
-----------------
|
||||
@ -247,7 +247,7 @@ end
|
||||
---@param active boolean
|
||||
---@return IO_LVL
|
||||
rsio.digital_write = function (channel, active)
|
||||
if channel < RS_IO.WASTE_PO or channel > RS_IO.R_PLC_TIMEOUT then
|
||||
if type(channel) ~= "number" or channel < RS_IO.F_ALARM or channel > RS_IO.R_PLC_TIMEOUT then
|
||||
return IO_LVL.LOW
|
||||
else
|
||||
return RS_DIO_MAP[channel]._f(active)
|
||||
@ -259,7 +259,7 @@ end
|
||||
---@param level IO_LVL
|
||||
---@return boolean
|
||||
rsio.digital_is_active = function (channel, level)
|
||||
if channel > RS_IO.R_ENABLE or channel > RS_IO.R_PLC_TIMEOUT then
|
||||
if type(channel) ~= "number" or channel > RS_IO.R_ENABLE then
|
||||
return false
|
||||
else
|
||||
return RS_DIO_MAP[channel]._f(level)
|
||||
|
149
test/rstest.lua
Normal file
149
test/rstest.lua
Normal file
@ -0,0 +1,149 @@
|
||||
require("/initenv").init_env()
|
||||
|
||||
local rsio = require("scada-common.rsio")
|
||||
local util = require("scada-common.util")
|
||||
|
||||
local testutils = require("test.testutils")
|
||||
|
||||
local print = util.print
|
||||
local println = util.println
|
||||
|
||||
local IO = rsio.IO
|
||||
local IO_LVL = rsio.IO_LVL
|
||||
local IO_DIR = rsio.IO_DIR
|
||||
local IO_MODE = rsio.IO_MODE
|
||||
|
||||
println("starting RSIO tester")
|
||||
println("")
|
||||
|
||||
println(">>> checking valid channels:")
|
||||
|
||||
-- channel function tests
|
||||
local cid = 0
|
||||
local max_value = 1
|
||||
for key, value in pairs(IO) do
|
||||
if value > max_value then max_value = value end
|
||||
cid = cid + 1
|
||||
|
||||
local c_name = rsio.to_string(value)
|
||||
local io_mode = rsio.get_io_mode(value)
|
||||
local mode = ""
|
||||
|
||||
if io_mode == IO_MODE.DIGITAL_IN then
|
||||
mode = " (DIGITAL_IN)"
|
||||
elseif io_mode == IO_MODE.DIGITAL_OUT then
|
||||
mode = " (DIGITAL_OUT)"
|
||||
elseif io_mode == IO_MODE.ANALOG_IN then
|
||||
mode = " (ANALOG_IN)"
|
||||
elseif io_mode == IO_MODE.ANALOG_OUT then
|
||||
mode = " (ANALOG_OUT)"
|
||||
else
|
||||
error("unknown mode for channel " .. key)
|
||||
end
|
||||
|
||||
assert(key == c_name, c_name .. " != " .. key .. ": " .. value .. mode)
|
||||
println(c_name .. ": " .. value .. mode)
|
||||
end
|
||||
|
||||
assert(max_value == cid, "RS_IO last IDx out-of-sync with count: " .. max_value .. " (count " .. cid .. ")")
|
||||
|
||||
---@diagnostic disable-next-line: undefined-field
|
||||
os.sleep(1)
|
||||
|
||||
println(">>> checking invalid channels:")
|
||||
|
||||
testutils.test_func("rsio.to_string", rsio.to_string, { -1, 100, false }, "")
|
||||
testutils.test_func_nil("rsio.to_string", rsio.to_string, "")
|
||||
testutils.test_func("rsio.get_io_mode", rsio.get_io_mode, { -1, 100, false }, IO_MODE.ANALOG_IN)
|
||||
testutils.test_func_nil("rsio.get_io_mode", rsio.get_io_mode, IO_MODE.ANALOG_IN)
|
||||
|
||||
---@diagnostic disable-next-line: undefined-field
|
||||
os.sleep(1)
|
||||
|
||||
println(">>> checking validity checks:")
|
||||
|
||||
local ivc_t_list = { 0, -1, 100 }
|
||||
testutils.test_func("rsio.is_valid_channel", rsio.is_valid_channel, ivc_t_list, false)
|
||||
testutils.test_func_nil("rsio.is_valid_channel", rsio.is_valid_channel, false)
|
||||
|
||||
local ivs_t_list = rs.getSides()
|
||||
testutils.test_func("rsio.is_valid_side", rsio.is_valid_side, ivs_t_list, true)
|
||||
testutils.test_func("rsio.is_valid_side", rsio.is_valid_side, { "" }, false)
|
||||
testutils.test_func_nil("rsio.is_valid_side", rsio.is_valid_side, false)
|
||||
|
||||
local ic_t_list = { colors.white, colors.purple, colors.blue, colors.cyan, colors.black }
|
||||
testutils.test_func("rsio.is_color", rsio.is_color, ic_t_list, true)
|
||||
testutils.test_func("rsio.is_color", rsio.is_color, { 0, 999999, colors.combine(colors.red, colors.blue, colors.black) }, false)
|
||||
testutils.test_func_nil("rsio.is_color", rsio.is_color, false)
|
||||
|
||||
---@diagnostic disable-next-line: undefined-field
|
||||
os.sleep(1)
|
||||
|
||||
println(">>> checking channel-independent I/O wrappers:")
|
||||
|
||||
testutils.test_func("rsio.digital_read", rsio.digital_read, { true, false }, { IO_LVL.HIGH, IO_LVL.LOW })
|
||||
|
||||
print("rsio.analog_read(): ")
|
||||
assert(rsio.analog_read(0, 0, 100) == 0, "RS_READ_0_100")
|
||||
assert(rsio.analog_read(7.5, 0, 100) == 50, "RS_READ_7_5_100")
|
||||
assert(rsio.analog_read(15, 0, 100) == 100, "RS_READ_15_100")
|
||||
assert(rsio.analog_read(4, 0, 15) == 4, "RS_READ_4_15")
|
||||
assert(rsio.analog_read(12, 0, 15) == 12, "RS_READ_12_15")
|
||||
println("PASS")
|
||||
|
||||
print("rsio.analog_write(): ")
|
||||
assert(rsio.analog_write(0, 0, 100) == 0, "RS_WRITE_0_100")
|
||||
assert(rsio.analog_write(100, 0, 100) == 15, "RS_WRITE_100_100")
|
||||
assert(rsio.analog_write(4, 0, 15) == 4, "RS_WRITE_4_15")
|
||||
assert(rsio.analog_write(12, 0, 15) == 12, "RS_WRITE_12_15")
|
||||
println("PASS")
|
||||
|
||||
---@diagnostic disable-next-line: undefined-field
|
||||
os.sleep(1)
|
||||
|
||||
println(">>> checking channel I/O:")
|
||||
|
||||
print("rsio.digital_is_active(...): ")
|
||||
|
||||
-- check input channels
|
||||
assert(rsio.digital_is_active(IO.F_SCRAM, IO_LVL.LOW) == true, "IO_F_SCRAM_HIGH")
|
||||
assert(rsio.digital_is_active(IO.F_SCRAM, IO_LVL.HIGH) == false, "IO_F_SCRAM_LOW")
|
||||
assert(rsio.digital_is_active(IO.R_SCRAM, IO_LVL.LOW) == true, "IO_R_SCRAM_HIGH")
|
||||
assert(rsio.digital_is_active(IO.R_SCRAM, IO_LVL.HIGH) == false, "IO_R_SCRAM_LOW")
|
||||
assert(rsio.digital_is_active(IO.R_ENABLE, IO_LVL.LOW) == false, "IO_R_ENABLE_HIGH")
|
||||
assert(rsio.digital_is_active(IO.R_ENABLE, IO_LVL.HIGH) == true, "IO_R_ENABLE_LOW")
|
||||
|
||||
-- non-inputs should always return LOW
|
||||
assert(rsio.digital_is_active(IO.F_ALARM, IO_LVL.LOW) == false, "IO_OUT_READ_LOW")
|
||||
assert(rsio.digital_is_active(IO.F_ALARM, IO_LVL.HIGH) == false, "IO_OUT_READ_HIGH")
|
||||
|
||||
println("PASS")
|
||||
|
||||
-- check output channels
|
||||
|
||||
print("rsio.digital_write(...): ")
|
||||
|
||||
-- check output channels
|
||||
assert(rsio.digital_write(IO.F_ALARM, false) == IO_LVL.LOW, "IO_F_ALARM_FALSE")
|
||||
assert(rsio.digital_write(IO.F_ALARM, true) == IO_LVL.HIGH, "IO_F_ALARM_TRUE")
|
||||
assert(rsio.digital_write(IO.WASTE_PO, false) == IO_LVL.HIGH, "IO_WASTE_PO_FALSE")
|
||||
assert(rsio.digital_write(IO.WASTE_PO, true) == IO_LVL.LOW, "IO_WASTE_PO_TRUE")
|
||||
assert(rsio.digital_write(IO.WASTE_PU, false) == IO_LVL.HIGH, "IO_WASTE_PU_FALSE")
|
||||
assert(rsio.digital_write(IO.WASTE_PU, true) == IO_LVL.LOW, "IO_WASTE_PU_TRUE")
|
||||
assert(rsio.digital_write(IO.WASTE_AM, false) == IO_LVL.HIGH, "IO_WASTE_AM_FALSE")
|
||||
assert(rsio.digital_write(IO.WASTE_AM, true) == IO_LVL.LOW, "IO_WASTE_AM_TRUE")
|
||||
|
||||
-- check all reactor output channels (all are active high)
|
||||
for i = IO.R_ALARM, (IO.R_PLC_TIMEOUT - IO.R_ALARM + 1) do
|
||||
assert(rsio.to_string(i) ~= "", "REACTOR_IO_BAD_CHANNEL")
|
||||
assert(rsio.digital_write(i, false) == IO_LVL.LOW, "IO_" .. rsio.to_string(i) .. "_FALSE")
|
||||
assert(rsio.digital_write(i, true) == IO_LVL.HIGH, "IO_" .. rsio.to_string(i) .. "_TRUE")
|
||||
end
|
||||
|
||||
-- non-outputs should always return false
|
||||
assert(rsio.digital_write(IO.F_SCRAM, true) == IO_LVL.LOW, "IO_IN_WRITE_LOW")
|
||||
assert(rsio.digital_write(IO.F_SCRAM, false) == IO_LVL.LOW, "IO_IN_WRITE_HIGH")
|
||||
|
||||
println("PASS")
|
||||
|
||||
println("TEST COMPLETE")
|
65
test/testutils.lua
Normal file
65
test/testutils.lua
Normal file
@ -0,0 +1,65 @@
|
||||
local util = require("scada-common.util")
|
||||
|
||||
local print = util.print
|
||||
local println = util.println
|
||||
|
||||
local testutils = {}
|
||||
|
||||
-- get a value as a string
|
||||
---@param val any
|
||||
---@return string value value as string or "%VALSTR_UNKNOWN%"
|
||||
local function valstr(val)
|
||||
local t = type(val)
|
||||
|
||||
if t == "nil" then
|
||||
return "nil"
|
||||
elseif t == "number" then
|
||||
return "" .. val
|
||||
elseif t == "boolean" then
|
||||
if val then return "true" else return "false" end
|
||||
elseif t == "string" then
|
||||
return val
|
||||
elseif t == "table" or t == "function" then
|
||||
return val
|
||||
else
|
||||
return "%VALSTR_UNKNOWN%"
|
||||
end
|
||||
end
|
||||
|
||||
-- test a function
|
||||
---@param name string function name
|
||||
---@param f function function
|
||||
---@param values table input values, one per function call
|
||||
---@param results any table of values or a single value for all tests
|
||||
function testutils.test_func(name, f, values, results)
|
||||
-- if only one value was given, use that for all checks
|
||||
if type(results) ~= "table" then
|
||||
local _r = {}
|
||||
for _ = 1, #values do
|
||||
table.insert(_r, results)
|
||||
end
|
||||
results = _r
|
||||
end
|
||||
|
||||
assert(#values == #results, "test_func(" .. name .. ") #values ~= #results")
|
||||
|
||||
for i = 1, #values do
|
||||
local check = values[i]
|
||||
local expect = results[i]
|
||||
print(name .. "(" .. valstr(check) .. ") => ")
|
||||
assert(f(check) == expect, "FAIL")
|
||||
println("PASS")
|
||||
end
|
||||
end
|
||||
|
||||
-- test a function with nil as a parameter
|
||||
---@param name string function name
|
||||
---@param f function function
|
||||
---@param result any expected result
|
||||
function testutils.test_func_nil(name, f, result)
|
||||
print(name .. "(" .. valstr(nil) .. ") => ")
|
||||
assert(f(nil) == result, "FAIL")
|
||||
println("PASS")
|
||||
end
|
||||
|
||||
return testutils
|
Loading…
Reference in New Issue
Block a user