From a525f24c3ee276323088708dee70ee9bf9ceddd0 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Fri, 5 Oct 2018 17:16:14 +0200
Subject: Unify test launch between target and native

On a target, the binder process name is taken from the widget "id",
now the native launcher script also launches the binder using the widget "id".

As the controller searches its configuration file using the binder process middle name
we need to differentiate between both "id" otherwise the wrong configuration file is used.
The commit renames configuration file according to the new "id".

Change-Id: I4a596dd1d54201a671bb68bf9aca6904286322c6
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 test/afb-test/etc/aft-aftest-selftest.json | 69 ++++++++++++++++++++++++++++++
 test/afb-test/etc/aft-selftest.json        | 69 ------------------------------
 2 files changed, 69 insertions(+), 69 deletions(-)
 create mode 100644 test/afb-test/etc/aft-aftest-selftest.json
 delete mode 100644 test/afb-test/etc/aft-selftest.json

(limited to 'test')

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