X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fafb-test%2Ftests%2Flow-can_FilterTest01.lua;h=40d3f5616c90b6da4b6d7e873a3f240bcab8edd2;hb=9cc8fe590162ec91000f1d81dbfd888616afc6ab;hp=10e870e22627ae5666999fd497868e1cdf61d898;hpb=88281216540f5f61bcee7076259a25573c1cb50e;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 10e870e2..40d3f561 100644
--- a/test/afb-test/tests/low-can_FilterTest01.lua
+++ b/test/afb-test/tests/low-can_FilterTest01.lua
@@ -18,6 +18,13 @@
     NOTE: strict mode: every global variables should be prefixed by '_'
 --]]
 
+print("\n##########################################")
+print("#########    BEGIN FILTER TESTS   #########")
+print("##########################################\n")
+
+local api = "low-can"
+local evt = "messages.engine.speed"
+
 _AFT.setBeforeAll(function()
     local can = io.open("/sys/class/net/can0")
     if can == nil then
@@ -39,53 +46,57 @@ _AFT.setAfterAll( function()
 end)
 
 _AFT.describe("Filter_Test_01/Step_1", function()
-    local api = "low-can"
-    local evt = "engine.speed"
-
-    _AFT.addEventToMonitor(api .. "/" ..evt, function(eventname,data)
-        _AFT.assertEquals(data.name,evt)
+    _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.addEventToMonitor(api .. "/" ..evt, function(eventname, data)
         _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, filter =  {min = 30, max = 100} })
+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.describe("Filter_Test_01/Step_3", function()
     _AFT.enableEventHistory() -- You will need this to check for time intervals between two events
 
-    _AFT.addEventToMonitor(api .. "/" ..evt, function(eventname,data,dataH)
-        _AFT.assertEquals(dataH[1].name,evt)
+    _AFT.addEventToMonitor(api .. "/" ..evt, function(eventname, data, dataH)
+        _AFT.assertEquals(dataH[1].name, evt)
         _AFT.assertIsTrue(dataH[1].value > 30 and dataH[1].value < 100 )
-        _AFT.assertEquals(dataH[2].name,evt)
+        _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 > 1000000000) --This is in nano-seconds as it fetchs the low-can timestamp from the data field
+        _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]= 2}, 5000000)
-    _AFT.assertVerbStatusSuccess(api,"unsubscribe", { 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)
-]]
+