txc-binding: in conf files, rename api to txc

fix multiples errors, rename txc into txc-binding

Change-Id: I9cd32cf157e407d98293bc869ed08cc93518a555
Signed-off-by: Clément Bénier <clement.benier@iot.bzh>

6 files changed, 28 insertions, 39 deletions

diff --git a/conf.d/project/etc/control-signal-composer.json b/conf.d/project/etc/control-signal-composer.json
index 3e693f6..d6083e1 100644
--- a/conf.d/project/etc/control-signal-composer.json
+++ b/conf.d/project/etc/control-signal-composer.json
@@ -5,7 +5,7 @@
 		"version": "1.0",
 		"api": "signal-composer",
 		"info": "Signal composer Configuration",
-		"require": ["txc"]
+		"require": ["txc-binding"]
 	},
 	"plugins": [
 		{
diff --git a/conf.d/project/etc/sig-txc.json b/conf.d/project/etc/sig-txc.json
index c9c59cd..ec9ed81 100644
--- a/conf.d/project/etc/sig-txc.json
+++ b/conf.d/project/etc/sig-txc.json
@@ -3,7 +3,7 @@
 	"signals": [
 		{
 			"uid": "vehicle_speed",
-			"event": "txc/vehicle_speed",
+			"event": "txc-binding/vehicle_speed",
 			"retention": 30,
 			"unit": "km/h",
 			"getSignalsArgs": {
@@ -19,7 +19,7 @@
 		},
 		{
 			"uid": "engine_speed",
-			"event": "txc/engine_speed",
+			"event": "txc-binding/engine_speed",
 			"retention": 30,
 			"unit": "rpm",
 			"getSignalsArgs": {
@@ -28,7 +28,7 @@
 		},
 		{
 			"uid": "fuel_level",
-			"event": "txc/fuel_level",
+			"event": "txc-binding/fuel_level",
 			"retention": 30,
 			"unit": "liter",
 			"getSignalsArgs": {
@@ -37,7 +37,7 @@
 		},
 		{
 			"uid": "accelerator_pedal_position",
-			"event": "txc/accelerator_pedal_position",
+			"event": "txc-binding/accelerator_pedal_position",
 			"retention": 30,
 			"getSignalsArgs": {
 				"event": "accelerator_pedal_position"
@@ -45,7 +45,7 @@
 		},
 		{
 			"uid": "torque_at_transmission",
-			"event": "txc/torque_at_transmission",
+			"event": "txc-binding/torque_at_transmission",
 			"retention": 30,
 			"unit": "Nm",
 			"getSignalsArgs": {
@@ -54,7 +54,7 @@
 		},
 		{
 			"uid": "steering_wheel_angle",
-			"event": "txc/steering_wheel_angle",
+			"event": "txc-binding/steering_wheel_angle",
 			"retention": 30,
 			"unit": "degrees",
 			"getSignalsArgs": {
@@ -63,7 +63,7 @@
 		},
 		{
 			"uid": "fuel_consumed_since_restart",
-			"event": "txc/fuel_consumed_since_restart",
+			"event": "txc-binding/fuel_consumed_since_restart",
 			"retention": 30,
 			"unit": "liter",
 			"getSignalsArgs": {
@@ -72,7 +72,7 @@
 		},
 		{
 			"uid": "odometer",
-			"event": "txc/odometer",
+			"event": "txc-binding/odometer",
 			"retention": 30,
 			"unit": "km",
 			"getSignalsArgs": {
@@ -81,7 +81,7 @@
 		},
 		{
 			"uid": "latitude",
-			"event": "txc/latitude",
+			"event": "txc-binding/latitude",
 			"retention": 30,
 			"unit": "degrees",
 			"getSignalsArgs": {
@@ -90,7 +90,7 @@
 		},
 		{
 			"uid": "longitude",
-			"event": "txc/longitude",
+			"event": "txc-binding/longitude",
 			"retention": 30,
 			"unit": "degrees",
 			"getSignalsArgs": {
diff --git a/conf.d/project/etc/sources-txc.json b/conf.d/project/etc/sources-txc.json
index a460fee..5f41370 100644
--- a/conf.d/project/etc/sources-txc.json
+++ b/conf.d/project/etc/sources-txc.json
@@ -2,15 +2,15 @@
 	"$schema": "http://iot.bzh/download/public/schema/json/signal-composer-schema.json",
 	"sources": [
 		{
-			"uid": "TXC-demo",
-			"api": "txc",
-			"info": "Use TXC demo binding as signals provider",
+			"uid": "txc-binding-demo",
+			"api": "txc-binding",
+			"info": "Use txc-binding demo binding as signals provider",
 			"init": {
-				"action": "api://txc#start",
+				"action": "api://txc-binding#start",
 				"args": {"filename": "var/nyc-downtown-crosstown.json"}
 			},
 			"getSignals": {
-				"action": "api://txc#subscribe"
+				"action": "api://txc-binding#subscribe"
 			}
 		}
 	]
diff --git a/test/afb-test.sh b/test/afb-test.sh
index f792fb2..ea5f2b3 100755
--- a/test/afb-test.sh
+++ b/test/afb-test.sh
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/sh -x
 trap "cleanup 0" EXIT
 trap "cleanup 1" SIGINT SIGTERM SIGABRT SIGHUP
 cleanup() {
   trap '' SIGINT SIGTERM SIGABRT SIGHUP EXIT
   kill $AFTESTPID > /dev/null 2>&1
-  rm -f $AFTESTSOCKET
   pkill $PROCNAME
   exit $1
 }
@@ -13,8 +12,7 @@ BINDER=$(command -v afb-daemon)
 AFBTEST="$(pkg-config --variable libdir afb-test)/aft.so"
 if [ ! $? -eq 0 ]; then echo "Set PKG_CONFIG_PATH for afb-test"; exit -1; fi
 PROCNAME="afbd-signal-composer"
-PORT1=1234
-PORT2=1235
+PORT=1234
 TOKEN=
 [ "$1" ] && BUILDDIR="$1" || exit 1
 AFTESTSOCKET=/tmp/signal-composer
@@ -26,24 +24,16 @@ export AFT_PLUGIN_PATH="${TESTPACKAGEDIR}/var:${TESTPACKAGEDIR}/lib/plugins"
 pkill $PROCNAME
 
 ${BINDER} 	--name="${PROCNAME}" \
-            --port="${PORT1}" \
+            --port="${PORT}" \
 			--tracereq=common \
 			--token=${TOKEN} \
-            --rootdir="${TESTPACKAGEDIR}/../package" \
-			--workdir="${TESTPACKAGEDIR}" \
-			--binding="../package/lib/afb-signal-composer.so" \
-            --ws-server=unix:${AFTESTSOCKET} > /dev/null 2>& 1 &
+			--workdir="${BUILDDIR}" \
+            --binding=${AFBTEST} \
+			--binding="package/lib/afb-signal-composer.so" \
+            -vvv \
+            --call="aft-signal-composer/launch_all_tests:{}" \
+            --call="aft-signal-composer/exit:{}"
 AFTESTPID=$!
 
-sleep 0.3
-
-${BINDER} --name=aft-signal-composer \
---workdir="package-test/" \
---port="${PORT2}" \
---binding=${AFBTEST} \
---ws-client=unix:${AFTESTSOCKET}  \
---call="aft-signal-composer/launch_all_tests:{}" \
---call="aft-signal-composer/exit:{}"
-
 find "${BUILDDIR}" -name test_results.log -exec cat {} \;
 
diff --git a/test/afb-test/etc/aft-signal-composer_config.json b/test/afb-test/etc/aft-signal-composer_config.json
index 4ec2285..cab8f24 100644
--- a/test/afb-test/etc/aft-signal-composer_config.json
+++ b/test/afb-test/etc/aft-signal-composer_config.json
@@ -22,7 +22,7 @@
     "mapis": [{
         "uid": "txc-binding",
         "info": "Faked txc-binding API",
-        "libs": "txc-binding.c",
+        "libs": "txc-binding.ctlso",
         "verbs": [
             {
                 "uid": "subscribe",
@@ -46,4 +46,4 @@
             }
         ]
     }]
-}
\ No newline at end of file
+}
diff --git a/test/afb-test/fixtures/txc-binding/CMakeLists.txt b/test/afb-test/fixtures/txc-binding/CMakeLists.txt
index 76a4923..fbc65f3 100644
--- a/test/afb-test/fixtures/txc-binding/CMakeLists.txt
+++ b/test/afb-test/fixtures/txc-binding/CMakeLists.txt
@@ -28,11 +28,10 @@ PROJECT_TARGET_ADD(txc-binding)
 	SUFFIX ".ctlso"
 	PREFIX ""
 		LABELS "TEST-PLUGIN"
-		LINK_FLAGS ${BINDINGS_LINK_FLAG}
 		OUTPUT_NAME ${TARGET_NAME}
 	)
 
 	# Library dependencies (include updates automatically)
 	TARGET_LINK_LIBRARIES(${TARGET_NAME}
 		ctl-utilities
-		${link_libraries})
\ No newline at end of file
+		${link_libraries})