diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2018-09-16 15:30:26 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-10 10:53:48 +0200 |
| commit | c541040fb5fa1b5333edb3755914428aa0af36ff (patch) | |
| tree | d2ab1bc5eb318651d3dfb10d48d542900b66f102 | |
| parent | 79bb6f3be1303025a2ed3914c5012ab2c9c08f73 (diff) | |
Rename test service api to be more discriminant.
Using aftest and aft-aftest api name to self test was
difficult because of searching file using the binder process
name which could be the same although api name were diffirent.
Change-Id: Id14e30024f0b98c29feed5b707ab9dc8b74d3552
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | conf.d/cmake/config.cmake | 2 | ||||
| -rw-r--r-- | conf.d/controller/etc/aft-aft.json (renamed from conf.d/controller/etc/aft-aftest.json) | 2 | ||||
| -rw-r--r-- | conf.d/wgt/config.xml.in | 2 | ||||
| -rw-r--r-- | test/afb-test/etc/aft-selftest.json (renamed from test/afb-test/etc/aft-aftest-self.json) | 2 | ||||
| -rw-r--r-- | test/afb-test/tests/aftTest.lua | 16 |
5 files changed, 12 insertions, 12 deletions
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 65d5e4e..582ed07 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -27,7 +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") +set(API_NAME "aft") # Where are stored default templates files from submodule or subtree app-templates in your project tree # relative to the root project directory diff --git a/conf.d/controller/etc/aft-aftest.json b/conf.d/controller/etc/aft-aft.json index 1a6c79a..c541c2b 100644 --- a/conf.d/controller/etc/aft-aftest.json +++ b/conf.d/controller/etc/aft-aft.json @@ -4,7 +4,7 @@ "metadata": { "uid": "Test", "version": "1.0", - "api": "afTest", + "api": "aft", "info": "Binding made to test other bindings", "require": [ "hello" diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in index b2b196d..adb4f18 100644 --- a/conf.d/wgt/config.xml.in +++ b/conf.d/wgt/config.xml.in @@ -17,7 +17,7 @@ </feature> <feature name="urn:AGL:widget:provided-api"> - <param name="afTest" value="ws" /> + <param name="@API_NAME@" value="ws" /> </feature> <feature name="urn:AGL:widget:required-binding"> diff --git a/test/afb-test/etc/aft-aftest-self.json b/test/afb-test/etc/aft-selftest.json index f8ebbcd..5a3f1dd 100644 --- a/test/afb-test/etc/aft-aftest-self.json +++ b/test/afb-test/etc/aft-selftest.json @@ -4,7 +4,7 @@ "metadata": { "uid": "Test", "version": "1.0", - "api": "aft-aftest", + "api": "aft-selftest", "info": "Binding made to test other bindings", "require": [ "low-can" diff --git a/test/afb-test/tests/aftTest.lua b/test/afb-test/tests/aftTest.lua index 0503ae3..5c11d1d 100644 --- a/test/afb-test/tests/aftTest.lua +++ b/test/afb-test/tests/aftTest.lua @@ -97,13 +97,13 @@ _AFT.describe("testAssertNotIsThread", function() _AFT.assertNotIsThread(2) end) _AFT.describe("testAssertNotIsUserdata", function() _AFT.assertNotIsUserdata(2) end) function _callback(responseJ) _AFT.assertNotIsNil(responseJ) end -function _callbackError(responseJ) _AFT.assertStrContains(responseJ.request.info, "verb pingfail unknown within api afTest") end - -_AFT.describe("testAssertVerbStatusSuccess",function() _AFT.assertVerbStatusSuccess('afTest', 'ping', {}) end) -_AFT.describe("testAssertVerbResponseEquals",function() _AFT.assertVerbResponseEquals('afTest', 'ping', {}) end) -_AFT.describe("testAssertVerbCb",function() _AFT.assertVerbCb('afTest', 'ping', {},_callback) end) -_AFT.describe("testAssertVerbStatusError",function() _AFT.assertVerbStatusError('afTest', 'pingfail', {}) end) -_AFT.describe("testAssertVerbResponseEqualsError",function() _AFT.assertVerbResponseEqualsError('afTest', 'nonexistentverb', {},"Ping Binder Daemon fails") end) -_AFT.describe("testAssertVerbCbError",function() _AFT.assertVerbCbError('afTest', 'pingfail', {},_callbackError) end) +function _callbackError(responseJ) _AFT.assertStrContains(responseJ.request.info, "verb pingfail unknown within api aft") end + +_AFT.describe("testAssertVerbStatusSuccess",function() _AFT.assertVerbStatusSuccess('aft', 'ping', {}) end) +_AFT.describe("testAssertVerbResponseEquals",function() _AFT.assertVerbResponseEquals('aft', 'ping', {}) end) +_AFT.describe("testAssertVerbCb",function() _AFT.assertVerbCb('aft', 'ping', {},_callback) end) +_AFT.describe("testAssertVerbStatusError",function() _AFT.assertVerbStatusError('aft', 'pingfail', {}) end) +_AFT.describe("testAssertVerbResponseEqualsError",function() _AFT.assertVerbResponseEqualsError('aft', 'nonexistentverb', {},"Ping Binder Daemon fails") end) +_AFT.describe("testAssertVerbCbError",function() _AFT.assertVerbCbError('aft', 'pingfail', {},_callbackError) end) _AFT.exitAtEnd() |