summaryrefslogtreecommitdiffstats
path: root/test/afb-test/tests
diff options
context:
space:
mode:
author8000ff <clementmallejac@gmail.com>2018-07-20 10:47:28 +0200
committer8000ff <clementmallejac@gmail.com>2018-07-20 11:26:52 +0200
commite8eba1c53e1bbccc8c3ae21958e885586bb3c260 (patch)
tree0a4a0077f7fe716a01de3cb4eb23174b9ed8bb19 /test/afb-test/tests
parent2b11138a150dd2e27cbf49231157f4560d536196 (diff)
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 <clementmallejac@gmail.com>
Diffstat (limited to 'test/afb-test/tests')
-rw-r--r--test/afb-test/tests/low-can-tests.lua50
-rw-r--r--test/afb-test/tests/low-can_BasicAPITest.lua (renamed from test/afb-test/tests/low-can-coverage.lua)40
-rw-r--r--test/afb-test/tests/low-can_FilterTest01.lua56
3 files changed, 79 insertions, 67 deletions
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 <romain.forlot@iot.bzh>
-
- 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-coverage.lua b/test/afb-test/tests/low-can_BasicAPITest.lua
index 3d78168e..5dddb55e 100644
--- a/test/afb-test/tests/low-can-coverage.lua
+++ b/test/afb-test/tests/low-can_BasicAPITest.lua
@@ -28,45 +28,51 @@ _AFT.setBeforeAll(function()
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()
- _AFT.assertVerbStatusSuccess("low-can","subscribe", { event = "diagnostic_messages.engine.speed" })
+
+ local api = "low-can"
+ local evt = "diagnostic_messages.engine.speed"
+ _AFT.assertVerbStatusSuccess(api,"subscribe", { event = evt })
- local evt = "low-can/diagnostic_messages"
- _AFT.addEventToMonitor(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(evt, function(eventName, data)
- _AFT.assertIsTrue(data.name == "diagnostic_messages.engine.speed")
- end)
+ _AFT.assertEvtReceived(api .. "/" .. evt, 1000000)
_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 api = "low-can"
+ local evt = "messages.vehicle.average.speed"
- local evt = "low-can/messages.vehicle.average.speed"
- _AFT.addEventToMonitor(evt)
+
+ _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(evt, function(eventName, data)
- _AFT.assertIsTrue(data.name == "messages.vehicle.average.speed")
- end)
+ _AFT.assertEvtReceived(api .. "/" .. evt, 5000000);
- _AFT.assertVerbStatusSuccess("low-can","unsubscribe", { event = "*" })
+ _AFT.assertVerbStatusSuccess(api,"unsubscribe", { event = "*" })
- local ret = os.execute("pkill canplayer")
- _AFT.assertIsTrue(ret)
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 <clementmallejac@gmail.com>
+
+ 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