From 0406deaa862dffb3527ae13198f1d0f858656c2e Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 23 Aug 2018 00:24:39 +0200 Subject: Use separate test folder to hold test files Also separate helloWorld example binding test from self aft tests Change-Id: I5b7c48b38cc6629c3edc97d280d7f9228451b337 Signed-off-by: Romain Forlot --- conf.d/cmake/config.cmake | 3 +- conf.d/controller/etc/aft-mapis.json | 69 -------------------- conf.d/controller/lua.d/aftTest.lua | 107 ------------------------------- conf.d/controller/lua.d/helloworld.lua | 59 ----------------- conf.d/controller/lua.d/mapi_low-can.lua | 51 --------------- conf.d/controller/lua.d/mapi_tests.lua | 33 ---------- 6 files changed, 2 insertions(+), 320 deletions(-) delete mode 100644 conf.d/controller/etc/aft-mapis.json delete mode 100644 conf.d/controller/lua.d/aftTest.lua delete mode 100644 conf.d/controller/lua.d/helloworld.lua delete mode 100644 conf.d/controller/lua.d/mapi_low-can.lua delete mode 100644 conf.d/controller/lua.d/mapi_tests.lua (limited to 'conf.d') diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index ea9227b..65d5e4e 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -27,6 +27,7 @@ set(PROJECT_AUTHOR "Forlot Romain") set(PROJECT_AUTHOR_MAIL "romain.forlot@iot.bzh") set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES "C") +set(API_NAME "afTest") # Where are stored default templates files from submodule or subtree app-templates in your project tree # relative to the root project directory @@ -188,7 +189,7 @@ set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port") # Print a helper message when every thing is finished # ---------------------------------------------------- -set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --name ${PROJECT_NAME} --port=${AFB_REMPORT} --workdir=package --ldpaths=/opt/AGL/lib64/afb:lib --token=\"${AFB_TOKEN}\"") +set(CLOSING_MESSAGE "Typical binding launch: afb-daemon --name ${PROJECT_NAME} --port=${AFB_REMPORT} --workdir=package-test --ldpaths=/opt/AGL/lib64/afb:../package/lib --token=\"${AFB_TOKEN}\"") set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt") # Optional schema validator about now only XML, LUA and JSON diff --git a/conf.d/controller/etc/aft-mapis.json b/conf.d/controller/etc/aft-mapis.json deleted file mode 100644 index c61aaba..0000000 --- a/conf.d/controller/etc/aft-mapis.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "id": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json#", - "metadata": { - "uid": "Test", - "version": "1.0", - "api": "afTest", - "info": "Configuration to test an emulated api", - "require": [ - "low-can" - ] - }, - "testVerb": { - "uid": "launch_all_tests", - "info": "Launch all the tests", - "action": "lua://AFT#_launch_test", - "args": { - "trace": "low-can", - "files": "mapi_tests.lua" - } - }, - "mapis": [{ - "uid": "low-can", - "info": "Faked low-can API", - "libs": "mapi_low-can.lua", - "verbs": [ - { - "uid": "subscribe", - "info": "Subscribe to CAN signals events", - "action": "lua://low-can#_subscribe" - }, - { - "uid": "unsubscribe", - "info": "Unsubscribe previously suscribed signals.", - "action": "lua://low-can#_unsubscribe" - }, - { - "uid": "get", - "info": "get a current value of CAN message", - "action": "lua://low-can#_get" - }, - { - "uid": "list", - "info": "get a supported CAN message list", - "action": "lua://low-can#_list" - }, - { - "uid": "auth", - "info": "Authenticate session to be raise Level Of Assurance.", - "action": "lua://low-can#_auth" - }, - { - "uid": "write", - "info": "Write a CAN messages to the CAN bus.", - "action": "lua://low-can#_write" - } - ], - "events": [{ - "uid": "low-can/diagnostic_messages", - "action": "lua://AFT#_evt_catcher_" - },{ - "uid": "low-can/messages_engine_speed", - "action": "lua://AFT#_evt_catcher_" - },{ - "uid": "low-can/messages_vehicle_speed", - "action": "lua://AFT#_evt_catcher_" - }] - }] -} diff --git a/conf.d/controller/lua.d/aftTest.lua b/conf.d/controller/lua.d/aftTest.lua deleted file mode 100644 index 4dc93b8..0000000 --- a/conf.d/controller/lua.d/aftTest.lua +++ /dev/null @@ -1,107 +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.setBeforeEach(function() print("~~~~~ Begin Test ~~~~~") end) -_AFT.setAfterEach(function() print("~~~~~ End Test ~~~~~") end) - -_AFT.setBeforeAll(function() print("~~~~~~~~~~ BEGIN ALL TESTS ~~~~~~~~~~") return 0 end) -_AFT.setAfterAll(function() print("~~~~~~~~~~ END ALL TESTS ~~~~~~~~~~") return 0 end) - -_AFT.setBefore("testAssertNotEquals",function() print("~~~~~ Begin Test AssertNotEquals ~~~~~") end) -_AFT.setAfter("testAssertNotEquals",function() print("~~~~~ End Test AssertNotEquals ~~~~~") end) - - -local corout = coroutine.create( print ) - -_AFT.describe("testAssertEquals", function() _AFT.assertEquals(false, false) end,function() print("~~~~~ Begin Test Assert Equals ~~~~~") end,function() print("~~~~~ End Test Assert Equals ~~~~~") end) -_AFT.describe("testAssertNotEquals", function() _AFT.assertNotEquals(true,false) end) -_AFT.describe("testAssertItemsEquals", function() _AFT.assertItemsEquals({1,2,3},{3,1,2}) end) -_AFT.describe("testAssertAlmostEquals", function() _AFT.assertAlmostEquals(1.25 ,1.5,0.5) end) -_AFT.describe("testAssertNotAlmostEquals", function() _AFT.assertNotAlmostEquals(1.25,1.5,0.125) end) -_AFT.describe("testAssertEvalToTrue", function() _AFT.assertEvalToTrue(true) end) -_AFT.describe("testAssertEvalToFalse", function() _AFT.assertEvalToFalse(false) end) - -_AFT.describe("testAssertStrContains", function() _AFT.assertStrContains("Hello I'm a string","string") end) -_AFT.describe("testAssertStrContains", function() _AFT.assertStrContains("Hello I'm a second string","second",5) end) - -_AFT.describe("testAssertStrIContains", function() _AFT.assertStrIContains("Hello I'm another string","I'm") end) - -_AFT.describe("testAssertNotStrContains", function() _AFT.assertNotStrContains("Hello it's me again, the other string","banana") end) -_AFT.describe("testAssertNotStrContains", function() _AFT.assertNotStrContains("Hello it's me again, the other string","banana",8) end) - -_AFT.describe("testAssertNotStrIContains", function() _AFT.assertNotStrIContains("Hello it's not me this time !","trebuchet") end) - -_AFT.describe("testAssertStrMatches", function() _AFT.assertStrMatches("Automotive Grade Linux","Automotive Grade Linux") end) -_AFT.describe("testAssertStrMatches", function() _AFT.assertStrMatches("Automotive Grade Linux from IoT.bzh","Automotive Grade Linux",1,22) end) -_AFT.describe("testAssertError", function() _AFT.assertError(_AFT.assertEquals(true,true)) end) - -_AFT.describe("testAssertErrorMsgEquals", function() _AFT.assertErrorMsgEquals("attempt to call a nil value", - _AFT.assertStrMatches("test assertErrorMsgEquals","test",1,4)) end) -_AFT.describe("testAssertErrorMsgContains", function() _AFT.assertErrorMsgContains("attempt to call", - _AFT.assertStrMatches("test assertErrorMsgEquals","test",1,4)) end) -_AFT.describe("testAssertErrorMsgMatches", function() _AFT.assertErrorMsgMatches('attempt to call a nil value', - _AFT.assertStrMatches("test assertErrorMsgEquals","test",1,4)) end) - -_AFT.describe("testAssertIs", function() _AFT.assertIs('toto','to'..'to') end) -_AFT.describe("testAssertNotIs", function() _AFT.assertNotIs({1,2},{1,2}) end) - -_AFT.describe("testAssertIsNumber", function() _AFT.assertIsNumber(23) end) -_AFT.describe("testAssertIsString", function() _AFT.assertIsString("Lapin bihan") end) -_AFT.describe("testAssertIsTable", function() _AFT.assertIsTable({1,2,3,4}) end) -_AFT.describe("testAssertIsBoolean", function() _AFT.assertIsBoolean(true) end) -_AFT.describe("testAssertIsNil", function() _AFT.assertIsNil(nil) end) -_AFT.describe("testAssertIsTrue", function() _AFT.assertIsTrue(true) end) -_AFT.describe("testAssertIsFalse", function() _AFT.assertIsFalse(false) end) -_AFT.describe("testAssertIsNaN", function() _AFT.assertIsNaN(0/0) end) -_AFT.describe("testAssertIsInf", function() _AFT.assertIsInf(1/0) end) -_AFT.describe("testAssertIsPlusInf", function() _AFT.assertIsPlusInf(1/0) end) -_AFT.describe("testAssertIsMinusInf", function() _AFT.assertIsMinusInf(-1/0) end) -_AFT.describe("testAssertIsPlusZero", function() _AFT.assertIsPlusZero(1/(1/0)) end) -_AFT.describe("testAssertIsMinusZero", function() _AFT.assertIsMinusZero(-1/(1/0)) end) -_AFT.describe("testAssertIsFunction", function() _AFT.assertIsFunction(print) end) -_AFT.describe("testAssertIsThread", function() _AFT.assertIsThread(corout) end) -_AFT.describe("testAssertIsUserdata", function() _AFT.assertIsUserdata(_AFT.context) end) - -_AFT.describe("testAssertNotIsNumber", function() _AFT.assertNotIsNumber('a') end) -_AFT.describe("testAssertNotIsString", function() _AFT.assertNotIsString(2) end) -_AFT.describe("testAssertNotIsTable", function() _AFT.assertNotIsTable(2) end) -_AFT.describe("testAssertNotIsBoolean", function() _AFT.assertNotIsBoolean(2) end) -_AFT.describe("testAssertNotIsNil", function() _AFT.assertNotIsNil(2) end) -_AFT.describe("testAssertNotIsTrue", function() _AFT.assertNotIsTrue(false) end) -_AFT.describe("testAssertNotIsFalse", function() _AFT.assertNotIsFalse(true) end) -_AFT.describe("testAssertNotIsNaN", function() _AFT.assertNotIsNaN(1) end) -_AFT.describe("testAssertNotIsInf", function() _AFT.assertNotIsInf(2) end) -_AFT.describe("testAssertNotIsPlusInf", function() _AFT.assertNotIsPlusInf(2) end) -_AFT.describe("testAssertNotIsMinusInf", function() _AFT.assertNotIsMinusInf(2) end) -_AFT.describe("testAssertNotIsPlusZero", function() _AFT.assertNotIsPlusZero(2) end) -_AFT.describe("testAssertNotIsMinusZero", function() _AFT.assertNotIsMinusZero(2) end) -_AFT.describe("testAssertNotIsFunction", function() _AFT.assertNotIsFunction(2) end) -_AFT.describe("testAssertNotIsThread", function() _AFT.assertNotIsThread(2) end) -_AFT.describe("testAssertNotIsUserdata", function() _AFT.assertNotIsUserdata(2) end) - -function _callback(responseJ) _AFT.assertStrContains(responseJ.response, "Some String") end -function _callbackError(responseJ) _AFT.assertStrContains(responseJ.request.info, "Ping Binder Daemon fails") end - -_AFT.describe("testAssertVerbStatusSuccess",function() _AFT.assertVerbStatusSuccess('hello', 'ping', {}) end) -_AFT.describe("testAssertVerbResponseEquals",function() _AFT.assertVerbResponseEquals('hello', 'ping', {},"Some String") end) -_AFT.describe("testAssertVerbCb",function() _AFT.assertVerbCb('hello', 'ping', {},_callback) end) -_AFT.describe("testAssertVerbStatusError",function() _AFT.assertVerbStatusError('hello', 'pingfail', {}) end) -_AFT.describe("testAssertVerbResponseEqualsError",function() _AFT.assertVerbResponseEqualsError('hello', 'nonexistentverb', {},"Ping Binder Daemon fails") end) -_AFT.describe("testAssertVerbCbError",function() _AFT.assertVerbCbError('hello', 'pingfail', {},_callbackError) end) diff --git a/conf.d/controller/lua.d/helloworld.lua b/conf.d/controller/lua.d/helloworld.lua deleted file mode 100644 index 2e99a6e..0000000 --- a/conf.d/controller/lua.d/helloworld.lua +++ /dev/null @@ -1,59 +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 '_' ---]] - -function _callback(responseJ) - _AFT.assertStrContains(responseJ.response, "Some String") -end - -function _callbackError(responseJ) - _AFT.assertStrContains(responseJ.request.info, "Ping Binder Daemon fails") -end -function _callbackEvent(eventName, eventData) - _AFT.assertEquals(eventData, { key = 'weird others data', another_key = 123.456 }) -end - -_AFT.addEventToMonitor("hello/anEvent") -_AFT.addEventToMonitor("hello/anotherEvent", _callbackEvent) - -_AFT.testVerbStatusSuccess('testPingSuccess','hello', 'ping', {}) -_AFT.setBefore("testPingSuccess",function() print("~~~~~ Begin testPingSuccess ~~~~~") end) -_AFT.setAfter("testPingSuccess",function() print("~~~~~ End testPingSuccess ~~~~~") end) - -_AFT.testVerbResponseEquals('testPingSuccessAndResponse','hello', 'ping', {}, "Some String") -_AFT.testVerbCb('testPingSuccessCallback','hello', 'ping', {}, _callback) - -_AFT.testVerbStatusError('testPingError', 'hello', 'pingfail', {}) -_AFT.testVerbResponseEqualsError('testPingErrorAndResponse', 'hello', 'pingfail', {}, "Ping Binder Daemon succeeds") -_AFT.testVerbCbError('testPingErrorCallback', 'hello', 'pingfail', {}, _callbackError) - -_AFT.testVerbStatusSuccess('testEventAddanEvent', 'hello', 'eventadd', {tag = 'event', name = 'anEvent'}) -_AFT.testVerbStatusSuccess('testEventSubanEvent', 'hello', 'eventsub', {tag = 'event'}) -_AFT.testVerbStatusSuccess('testEventPushanEvent', 'hello', 'eventpush', {tag = 'event', data = { key = 'some data', another_key = 123}}) - -_AFT.testVerbStatusSuccess('testEventAddanotherEvent', 'hello', 'eventadd', {tag = 'evt', name = 'anotherEvent'}) -_AFT.testVerbStatusSuccess('testEventSubanotherEvent', 'hello', 'eventsub', {tag = 'evt'}) -_AFT.testVerbStatusSuccess('testEventPushanotherEvent', 'hello', 'eventpush', {tag = 'evt', data = { key = 'weird others data', another_key = 123.456}}) - -_AFT.testVerbStatusSuccess('testGenerateWarning', 'hello', 'verbose', {level = 4, message = 'My Warning message!'}) - -_AFT.testEvtGrpReceived("testEventGroupReceived",{["hello/anEvent"]=1,["hello/anotherEvent"]=1}) - -_AFT.testEvtReceived("testanEventReceived", "hello/anEvent") -_AFT.testEvtReceived("testanotherEventReceived", "hello/anotherEvent") diff --git a/conf.d/controller/lua.d/mapi_low-can.lua b/conf.d/controller/lua.d/mapi_low-can.lua deleted file mode 100644 index 9909492..0000000 --- a/conf.d/controller/lua.d/mapi_low-can.lua +++ /dev/null @@ -1,51 +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 '_' ---]] - -function _subscribe(source, args) - AFB:success(source) -end - -function _unsubscribe(source, args) - AFB:success(source) -end - -function _get(source, args) - local evtHandle1 = AFB:evtmake(source, 'messages_engine_speed') - local evtHandle2 = AFB:evtmake(source, 'messages_vehicle_speed') - if type(evtHandle1) == "userdata" and type(evtHandle2) == "userdata" then - AFB:subscribe(source, evtHandle1) - AFB:evtpush(source,evtHandle1,{value = 1234}) - AFB:subscribe(source, evtHandle2) - AFB:evtpush(source,evtHandle2,{value = 5678}) - end - AFB:success(source) -end - -function _list(source, args) - AFB:success(source) -end - -function _auth(source, args) - AFB:success(source) -end - -function _write(source, args) - AFB:success(source) -end diff --git a/conf.d/controller/lua.d/mapi_tests.lua b/conf.d/controller/lua.d/mapi_tests.lua deleted file mode 100644 index ced9ea0..0000000 --- a/conf.d/controller/lua.d/mapi_tests.lua +++ /dev/null @@ -1,33 +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.testVerbStatusSuccess("TestListverb", "low-can", "list", {}) -_AFT.testVerbStatusSuccess("TestGetVerb", "low-can", "get", { event = "engine.speed"}) - -_AFT.describe("Test_turning_on", function() - local evt1 = "low-can/messages_engine_speed" - local evt2 = "low-can/messages_vehicle_speed" - _AFT.addEventToMonitor(evt1) - _AFT.addEventToMonitor(evt2) - - _AFT.assertVerb("low-can", "get", {}) - - _AFT.assertEvtGrpReceived({[evt1] = 1, [evt2] = 1}) -end) -- cgit 1.2.3-korg