From e8eba1c53e1bbccc8c3ae21958e885586bb3c260 Mon Sep 17 00:00:00 2001 From: 8000ff Date: Fri, 20 Jul 2018 10:47:28 +0200 Subject: Improved testing procedures - Deleted deprecated low-can-tests.lua - Renamed low-can-coverage.lua as it does not describe its purpose - Added 2 new canreplay files - Added new test file for testing subscription filters - Edited the test configuration to play the new test file Change-Id: I11315581a5fac7428ed17d3ef299a9f0e96ce7f4 Signed-off-by: 8000ff --- test/afb-test/tests/low-can-coverage.lua | 72 ------------------------- test/afb-test/tests/low-can-tests.lua | 50 ------------------ test/afb-test/tests/low-can_BasicAPITest.lua | 78 ++++++++++++++++++++++++++++ test/afb-test/tests/low-can_FilterTest01.lua | 56 ++++++++++++++++++++ 4 files changed, 134 insertions(+), 122 deletions(-) delete mode 100644 test/afb-test/tests/low-can-coverage.lua delete mode 100644 test/afb-test/tests/low-can-tests.lua create mode 100644 test/afb-test/tests/low-can_BasicAPITest.lua create mode 100644 test/afb-test/tests/low-can_FilterTest01.lua (limited to 'test/afb-test/tests') diff --git a/test/afb-test/tests/low-can-coverage.lua b/test/afb-test/tests/low-can-coverage.lua deleted file mode 100644 index 3d78168e..00000000 --- a/test/afb-test/tests/low-can-coverage.lua +++ /dev/null @@ -1,72 +0,0 @@ - ---[[ - Copyright (C) 2018 "IoT.bzh" - Author Romain Forlot - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - NOTE: strict mode: every global variables should be prefixed by '_' ---]] - -_AFT.setBeforeAll(function() - local can = io.open("/sys/class/net/can0") - if can == nil then - print("# You do not have 'can0' device set. Please run the following command:\n### sudo modprobe vcan; sudo ip link add can0 type vcan; sudo ip link set can0 up ") - return -1 - end - return 0 -end) - -_AFT.testVerbStatusSuccess("low-can_list", "low-can", "list", {}) -_AFT.testVerbStatusSuccess("low-can_get", "low-can", "get", { event = "engine.speed"}) - -_AFT.describe("Diagnostic_engine_speed_simulation", function() - _AFT.assertVerbStatusSuccess("low-can","subscribe", { event = "diagnostic_messages.engine.speed" }) - - local evt = "low-can/diagnostic_messages" - _AFT.addEventToMonitor(evt) - - local ret = os.execute("./var/replay_launcher.sh ./var/test1.canreplay") - _AFT.assertIsTrue(ret) - - _AFT.assertEvtReceived(evt, function(eventName, data) - _AFT.assertIsTrue(data.name == "diagnostic_messages.engine.speed") - end) - - _AFT.assertVerbStatusSuccess("low-can","unsubscribe", { event = "diagnostic_messages.engine.speed" }) - - local ret = os.execute("pkill canplayer") - _AFT.assertIsTrue(ret) -end) - -_AFT.describe("Subscribe_all", function() - _AFT.assertVerbStatusSuccess("low-can","subscribe", { event = "*" }) - - local evt = "low-can/messages.vehicle.average.speed" - _AFT.addEventToMonitor(evt) - - local ret = os.execute("./var/replay_launcher.sh ./var/test2-3.canreplay") - _AFT.assertIsTrue(ret) - - _AFT.assertEvtReceived(evt, function(eventName, data) - _AFT.assertIsTrue(data.name == "messages.vehicle.average.speed") - end) - - _AFT.assertVerbStatusSuccess("low-can","unsubscribe", { event = "*" }) - - local ret = os.execute("pkill canplayer") - _AFT.assertIsTrue(ret) -end) - -_AFT.exitAtEnd() diff --git a/test/afb-test/tests/low-can-tests.lua b/test/afb-test/tests/low-can-tests.lua deleted file mode 100644 index 6a6085ef..00000000 --- a/test/afb-test/tests/low-can-tests.lua +++ /dev/null @@ -1,50 +0,0 @@ - ---[[ - Copyright (C) 2018 "IoT.bzh" - Author Romain Forlot - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - NOTE: strict mode: every global variables should be prefixed by '_' ---]] - -_AFT.describe("Test_detection_is_off", function() - local logMsg = "signal: Engine is off, diagnostic_messages.engine.speed won't received responses until it's on" - _AFT.addLogToMonitor("low-can", "warning", logMsg) - - _AFT.assertVerbStatusSuccess("low-can","subscribe", { event = "diagnostic_messages.engine.speed" }) - _AFT.assertLogReceived(logMsg) -end) - -_AFT.describe("Test_turning_on", function() - _AFT.assertVerbStatusSuccess("low-can","subscribe", { event = "diagnostic_messages.engine.speed" }) - - local evt = "low-can/diagnostic_messages" - _AFT.addEventToMonitor(evt) - - local ret = os.execute("./var/replay_launcher.sh ./var/test1.canreplay") - _AFT.assertIsTrue(ret) - - _AFT.assertEvtReceived(evt, function(eventName, data) - _AFT.assertIsTrue(data.name == "diagnostic_messages.engine.speed") - end) -end) - -_AFT.describe("Test_detection_is_on", function() - local logMsg = "signal: Engine is off, diagnostic_messages.engine.speed won't received responses until it's on" - _AFT.addLogToMonitor("low-can", "warning", logMsg) - - _AFT.assertVerbStatusSuccess("low-can","subscribe", { event = "diagnostic_messages.engine.speed" }) - _AFT.assertLogNotReceived(logMsg) -end) diff --git a/test/afb-test/tests/low-can_BasicAPITest.lua b/test/afb-test/tests/low-can_BasicAPITest.lua new file mode 100644 index 00000000..5dddb55e --- /dev/null +++ b/test/afb-test/tests/low-can_BasicAPITest.lua @@ -0,0 +1,78 @@ + +--[[ + Copyright (C) 2018 "IoT.bzh" + Author Romain Forlot + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + NOTE: strict mode: every global variables should be prefixed by '_' +--]] + +_AFT.setBeforeAll(function() + local can = io.open("/sys/class/net/can0") + if can == nil then + print("# You do not have 'can0' device set. Please run the following command:\n### sudo modprobe vcan; sudo ip link add can0 type vcan; sudo ip link set can0 up ") + return -1 + end + return 0 +end) + +_AFT.setAfterEach(function() + os.execute("pkill canplayer") + os.execute("pkill linuxcan-canpla") +end) + +_AFT.testVerbStatusSuccess("low-can_list", "low-can", "list", {}) +_AFT.testVerbStatusSuccess("low-can_get", "low-can", "get", { event = "engine.speed"}) + +_AFT.describe("Diagnostic_engine_speed_simulation", function() + + local api = "low-can" + local evt = "diagnostic_messages.engine.speed" + _AFT.assertVerbStatusSuccess(api,"subscribe", { event = evt }) + + _AFT.addEventToMonitor(api .. "/" .. evt ,function(eventName, data) + _AFT.assertIsTrue(data.name == "diagnostic_messages.engine.speed") + end) + + local ret = os.execute("./var/replay_launcher.sh ./var/test1.canreplay") + _AFT.assertIsTrue(ret) + + _AFT.assertEvtReceived(api .. "/" .. evt, 1000000) + + _AFT.assertVerbStatusSuccess("low-can","unsubscribe", { event = "diagnostic_messages.engine.speed" }) + +end) + +_AFT.describe("Subscribe_all", function() + local api = "low-can" + local evt = "messages.vehicle.average.speed" + + + _AFT.addEventToMonitor(api .. "/" .. evt, function(eventName, data) + _AFT.assertEquals(data.name,"messages.vehicle.average.speed") + end) + + _AFT.assertVerbStatusSuccess(api,"subscribe", { event = "*" }) + + local ret = os.execute("./var/replay_launcher.sh ./var/test2-3.canreplay") + _AFT.assertIsTrue(ret) + + _AFT.assertEvtReceived(api .. "/" .. evt, 5000000); + + _AFT.assertVerbStatusSuccess(api,"unsubscribe", { event = "*" }) + +end) + +_AFT.exitAtEnd() diff --git a/test/afb-test/tests/low-can_FilterTest01.lua b/test/afb-test/tests/low-can_FilterTest01.lua new file mode 100644 index 00000000..a5744768 --- /dev/null +++ b/test/afb-test/tests/low-can_FilterTest01.lua @@ -0,0 +1,56 @@ + --[[ + Copyright (C) 2018 "IoT.bzh" + Author Clément Malléjac + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + NOTE: strict mode: every global variables should be prefixed by '_' +--]] + +_AFT.setAfterEach( function() + os.execute("pkill canplayer") + os.execute("pkill linuxcan-canpla") +end) + +_AFT.describe("Filter_Test_01/Step_1", function() + local api = "low-can" + local evt = "engine.speed" + local min = 30; + local max = 100; + + _AFT.addEventToMonitor(api .. "/" ..evt, function(eventname,data) + _AFT.assertEquals(data.name,evt) + end) + _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter = { min = 30, max = 100}}) + os.execute("./var/replay_launcher.sh ./var/testFilter01filteredOut.canreplay"); + _AFT.assertEvtNotReceived(api .. "/" ..evt, 1000000) +end) + +_AFT.describe("Filter_Test_01/Step_2", function() + local api = "low-can" + local evt = "messages.engine.speed" + local min = 30; + local max = 100; + + _AFT.addEventToMonitor(api .. "/" ..evt, function(eventname,data) + print(data.name .."-vs-" .. evt) + _AFT.assertEquals(data.name,evt) + _AFT.assertIsTrue(data.value > min and data.value < max ) + end) + _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter = { min = 30, max = 100}}) + os.execute("./var/replay_launcher.sh ./var/testFilter01pass.canreplay"); + + _AFT.assertEvtReceived(api .. "/" ..evt, 1000000) + _AFT.assertVerbStatusSuccess(api,"unsubscribe", { event = evt }) +end) \ No newline at end of file -- cgit 1.2.3-korg