X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fafb-test%2Ftests%2Flow-can_FilterTest01.lua;h=32e3c288c532b966e479d1d24bf52baf2498307b;hb=9cef9811c615df506807f405eb2de3c1a9268fba;hp=888b44d413ceec3f98e25c777cb4486b238cc846;hpb=1cd79737786b8aa12bfb552bbe77f1e2301758f7;p=apps%2Fagl-service-can-low-level.git

diff --git a/test/afb-test/tests/low-can_FilterTest01.lua b/test/afb-test/tests/low-can_FilterTest01.lua
index 888b44d4..32e3c288 100644
--- a/test/afb-test/tests/low-can_FilterTest01.lua
+++ b/test/afb-test/tests/low-can_FilterTest01.lua
@@ -18,59 +18,81 @@
     NOTE: strict mode: every global variables should be prefixed by '_'
 --]]
 
-_AFT.setAfterEach( function()
+local api = "low-can"
+local evt = "messages.engine.speed"
+
+_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.describe("Filter_Test_01/Step_1", function()
-    local api = "low-can"
-    local evt = "engine.speed"
+_AFT.setAfterAll( function()
+    os.execute("pkill canplayer")
+    os.execute("pkill linuxcan-canpla")
+    return 0
+end)
 
+_AFT.describe("Filter_Test_01/Step_1", function()
     _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");
+    local ret = os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/testFilter01filteredOut.canreplay");
+    _AFT.assertIsTrue(ret)
+
     _AFT.assertEvtNotReceived(api .. "/" ..evt, 1000000)
+end,
+nil,
+function()
+    _AFT.callVerb(api, "unsubscribe", { event = evt, filter =  {min = 30, max = 100} })
 end)
 
 _AFT.describe("Filter_Test_01/Step_2", function()
-    local api = "low-can"
-    local evt = "messages.engine.speed"
-
     _AFT.addEventToMonitor(api .. "/" ..evt, function(eventname,data)
-        _AFT.assertEquals(data.name,evt)
-        _AFT.assertIsTrue(data.value > min and data.value < max )
+        _AFT.assertEquals(eventname, api.."/"..evt)
+        _AFT.assertIsTrue(data.value > 30 and data.value < 100)
     end)
+
     _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter =  {min = 30, max = 100}})
-    os.execute("./var/replay_launcher.sh ./var/testFilter01pass.canreplay");
+    local ret = os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/testFilter01pass.canreplay");
+    _AFT.assertIsTrue(ret)
 
     _AFT.assertEvtReceived(api .. "/" ..evt, 1000000)
-    _AFT.assertVerbStatusSuccess(api,"unsubscribe", { event = evt })
+end,
+nil,
+function()
+    _AFT.callVerb(api, "unsubscribe", { event = evt, filter =  {min = 30, max = 100} })
 end)
 
 _AFT.describe("Filter_Test_01/Step_3", function()
-    local api = "low-can"
-    local evt = "messages.engine.speed"
-
     _AFT.enableEventHistory() -- You will need this to check for time intervals between two events
 
     _AFT.addEventToMonitor(api .. "/" ..evt, function(eventname,data,dataH)
-        local first = dataH[1];
-        local second = dataH[2];
-
-        _AFT.assertEquals(first.name,evt)
-        _AFT.assertIsTrue(first.value > 30 and first.value < 100 )
-        _AFT.assertEquals(second.name,evt)
-        _AFT.assertIsTrue(second.value > 30 and second.value < 100 )
-        assertIsTrue(second.timestamp-first.timestamp > 1000000000) --This is in nano-seconds as it fetchs the low-can timestamp from the data field
+        _AFT.assertEquals(dataH[1].name,evt)
+        _AFT.assertIsTrue(dataH[1].value > 30 and dataH[1].value < 100 )
+        _AFT.assertEquals(dataH[2].name,evt)
+        _AFT.assertIsTrue(dataH[2].value > 30 and dataH[2].value < 100 )
+        _AFT.assertIsTrue(dataH[2].timestamp - dataH[1].timestamp >= 1000000)
     end)
-    _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter =  { frequency = 1 , min = 30, max = 100}})
-    os.execute("./var/replay_launcher.sh ./var/testFilter01pass.canreplay");
 
-    _AFT.assertEvtGrpReceived({api .. "/" ..evt,api .. "/" ..evt}, 10000000)
-    _AFT.assertVerbStatusSuccess(api,"unsubscribe", { event = evt })
+    _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter =  { frequency = 1 , min = 30, max = 100}})
+    local ret = os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/testFilter01pass.canreplay");
+    _AFT.assertIsTrue(ret)
+
+    _AFT.assertEvtGrpReceived({[api .."/"..evt]= 2}, 3000000)
+end,
+nil,
+function()
+    _AFT.callVerb(api, "unsubscribe", { event = evt, filter =  { frequency = 1 , min = 30, max = 100}})
 end)