From c541040fb5fa1b5333edb3755914428aa0af36ff Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Sun, 16 Sep 2018 15:30:26 +0200
Subject: 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>
---
 conf.d/cmake/config.cmake             |  2 +-
 conf.d/controller/etc/aft-aft.json    | 22 ++++++++++++++++++++++
 conf.d/controller/etc/aft-aftest.json | 22 ----------------------
 conf.d/wgt/config.xml.in              |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 conf.d/controller/etc/aft-aft.json
 delete mode 100644 conf.d/controller/etc/aft-aftest.json

(limited to 'conf.d')

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-aft.json b/conf.d/controller/etc/aft-aft.json
new file mode 100644
index 0000000..c541c2b
--- /dev/null
+++ b/conf.d/controller/etc/aft-aft.json
@@ -0,0 +1,22 @@
+{
+    "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": "aft",
+        "info": "Binding made to test other bindings",
+        "require": [
+            "hello"
+        ]
+    },
+    "testVerb": {
+        "uid": "launch_all_tests",
+        "info": "Launch all the tests",
+        "action": "lua://AFT#_launch_test",
+        "args": {
+            "trace": "hello",
+            "files": ["aftTest.lua","helloworld.lua"]
+        }
+    }
+}
diff --git a/conf.d/controller/etc/aft-aftest.json b/conf.d/controller/etc/aft-aftest.json
deleted file mode 100644
index 1a6c79a..0000000
--- a/conf.d/controller/etc/aft-aftest.json
+++ /dev/null
@@ -1,22 +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": "Binding made to test other bindings",
-        "require": [
-            "hello"
-        ]
-    },
-    "testVerb": {
-        "uid": "launch_all_tests",
-        "info": "Launch all the tests",
-        "action": "lua://AFT#_launch_test",
-        "args": {
-            "trace": "hello",
-            "files": ["aftTest.lua","helloworld.lua"]
-        }
-    }
-}
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">
-- 
cgit 1.2.3-korg