From 8a35cc2a73a8d02feb30262a76e79fee49961df4 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 10 Jul 2018 16:26:39 +0200
Subject: Update controller mechanism

Add luaunit as xUnit lua framework

Change-Id: I49627b6554c62d05eca5e367d073b037385e40b1
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 conf.d/project/htdocs/AudioBinding.css |   7 --
 conf.d/project/htdocs/AudioBinding.js  | 197 ---------------------------------
 conf.d/project/htdocs/TestBinding.css  |   7 ++
 conf.d/project/htdocs/TestBinding.js   | 197 +++++++++++++++++++++++++++++++++
 conf.d/project/htdocs/index.html       |   6 +-
 5 files changed, 207 insertions(+), 207 deletions(-)
 delete mode 100644 conf.d/project/htdocs/AudioBinding.css
 delete mode 100644 conf.d/project/htdocs/AudioBinding.js
 create mode 100644 conf.d/project/htdocs/TestBinding.css
 create mode 100644 conf.d/project/htdocs/TestBinding.js

(limited to 'conf.d/project/htdocs')

diff --git a/conf.d/project/htdocs/AudioBinding.css b/conf.d/project/htdocs/AudioBinding.css
deleted file mode 100644
index 1052aa7..0000000
--- a/conf.d/project/htdocs/AudioBinding.css
+++ /dev/null
@@ -1,7 +0,0 @@
-pre {outline: 1px solid #ccc; padding: 5px; margin: 5px; }
-.string { color: green; }
-.number { color: darkorange; }
-.boolean { color: blue; }
-.null { color: magenta; }
-.key { color: red; }
-
diff --git a/conf.d/project/htdocs/AudioBinding.js b/conf.d/project/htdocs/AudioBinding.js
deleted file mode 100644
index 0f5caf9..0000000
--- a/conf.d/project/htdocs/AudioBinding.js
+++ /dev/null
@@ -1,197 +0,0 @@
-    var afb = new AFB("api", "mysecret");
-    var ws;
-    var sndcard="HALNotSelected";
-    var evtidx=0;
-    var numid=0;
-
-    function syntaxHighlight(json) {
-        if (typeof json !== 'string') {
-             json = JSON.stringify(json, undefined, 2);
-        }
-        json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-        return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
-            var cls = 'number';
-            if (/^"/.test(match)) {
-                if (/:$/.test(match)) {
-                    cls = 'key';
-                } else {
-                    cls = 'string';
-                }
-            } else if (/true|false/.test(match)) {
-                cls = 'boolean';
-            } else if (/null/.test(match)) {
-                cls = 'null';
-            }
-            return '<span class="' + cls + '">' + match + '</span>';
-        });
-    }
-
-    function getParameterByName(name, url) {
-        if (!url) {
-          url = window.location.href;
-        }
-        name = name.replace(/[\[\]]/g, "\\$&");
-        var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
-            results = regex.exec(url);
-        if (!results) return null;
-        if (!results[2]) return '';
-        return decodeURIComponent(results[2].replace(/\+/g, " "));
-    }
-
-    // default soundcard is "PCH"
-    var devid=getParameterByName("devid");
-    if (!devid) devid="hw:1";
-
-    var haldev=getParameterByName("haldev");
-    if (!haldev) haldev="scarlett-usb";
-
-    var sndname=getParameterByName("sndname");
-    if (!sndname) sndname="PCH";
-
-    var mode=getParameterByName("mode");
-    if (!mode) mode="0";
-
-
-
-
-    function replyok(obj) {
-            console.log("replyok:" + JSON.stringify(obj));
-            document.getElementById("output").innerHTML = "OK: "+ syntaxHighlight(obj);
-    }
-
-    function replyerr(obj) {
-            console.log("replyerr:" + JSON.stringify(obj));
-            document.getElementById("output").innerHTML = "ERROR: "+ syntaxHighlight(obj);
-    }
-
-    function gotevent(obj) {
-            console.log("gotevent:" + JSON.stringify(obj));
-            document.getElementById("outevt").innerHTML = (evtidx++) +": "+JSON.stringify(obj);
-    }
-
-    function send(message) {
-            var api = document.getElementById("api").value;
-            var verb = document.getElementById("verb").value;
-            document.getElementById("question").innerHTML = "subscribe: "+api+"/"+verb + " (" + JSON.stringify(message) +")";
-            ws.call(api+"/"+verb, {data:message}).then(replyok, replyerr);
-    }
-
-
-     // On button click from HTML page
-    function callbinder(api, verb, query) {
-            console.log ("subscribe api="+api+" verb="+verb+" query=" +query);
-            var question = urlws +"/" +api +"/" +verb + "?query=" + JSON.stringify(query);
-            document.getElementById("question").innerHTML = syntaxHighlight(question);
-            ws.call(api+"/"+verb, query).then(replyok, replyerr);
-    }
-
-
-    // Retreive Select value and Text from the binder
-    // Note: selection of value/text for a given context is huggly!!!
-    function querySelectList (elemid, api, verb, query) {
-
-        console.log("querySelectList elemid=%s api=%s verb=%s query=%s", elemid, api, verb, query);
-
-        var selectobj = document.getElementById(elemid);
-        if (!selectobj) {
-            return;
-        }
-
-        // onlick update selected HAL api
-        selectobj.onclick=function(){
-           sndcard= this.value;
-           console.log ("Default Selection=" + sndcard);
-        };
-
-        function gotit (result) {
-
-            // display response as for normal onclick action
-            replyok(result);
-            var response=result.response;
-
-            // fulfill select with avaliable active HAL
-            for (idx=0; idx<response.length; idx++) {
-                var opt = document.createElement('option');
-
-                // Alsa LowLevel selection mode
-                if (response[idx].name)  opt.text   = response[idx].name;
-                if (response[idx].devid) opt.value  = response[idx].devid;
-
-                // HAL selection mode
-                if (response[idx].shortname) opt.text  = response[idx].shortname;
-                if (response[idx].api) opt.value = response[idx].api;
-
-                selectobj.appendChild(opt);
-            }
-
-           sndcard= selectobj.value;
-        }
-
-        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
-        document.getElementById("question").innerHTML = syntaxHighlight(question);
-
-        // request lowlevel ALSA to get API list
-        ws.call(api+"/"+verb, query).then(gotit, replyerr);
-    }
-
-    function refresh_list (self, api, verb, query) {
-        console.log("refresh_list id=%s api=%s verb=%s query=%s", self.id, api, verb, query);
-
-        if (self.value > 0) return;
-
-        // onlick update selected HAL api
-        self.onclick=function(){
-           numid = parseInt(self.value);
-           console.log ("Default numid=%d", numid);
-        };
-
-        function gotit (result) {
-
-            // display response as for normal onclick action
-            replyok(result);
-            var response=result.response;
-
-
-
-            // fulfill select with avaliable active HAL
-            for (idx=0; idx<response.length; idx++) {
-                var opt = document.createElement('option');
-
-                // Alsa LowLevel selection mode
-                opt.text   = response[idx].name + ' id=' + response[idx].id;
-                opt.value  = response[idx].id;
-
-                self.appendChild(opt);
-            }
-            self.selectedIndex=2;
-            numid = parseInt (self.value);
-        }
-
-        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
-        document.getElementById("question").innerHTML = syntaxHighlight(question);
-
-        // request lowlevel ALSA to get API list
-        ws.call(api+"/"+verb, query).then(gotit, replyerr);
-    }
-
-
-    function init(elemid, api, verb, query) {
-
-        function onopen() {
-                // check for active HALs
-                querySelectList (elemid, api, verb, query);
-
-                document.getElementById("main").style.visibility = "visible";
-                document.getElementById("connected").innerHTML = "Binder WS Active";
-                document.getElementById("connected").style.background  = "lightgreen";
-                ws.onevent("*", gotevent);
-        }
-
-        function onabort() {
-                document.getElementById("main").style.visibility = "hidden";
-                document.getElementById("connected").innerHTML = "Connected Closed";
-                document.getElementById("connected").style.background  = "red";
-
-        }
-        ws = new afb.ws(onopen, onabort);
-    }
diff --git a/conf.d/project/htdocs/TestBinding.css b/conf.d/project/htdocs/TestBinding.css
new file mode 100644
index 0000000..1052aa7
--- /dev/null
+++ b/conf.d/project/htdocs/TestBinding.css
@@ -0,0 +1,7 @@
+pre {outline: 1px solid #ccc; padding: 5px; margin: 5px; }
+.string { color: green; }
+.number { color: darkorange; }
+.boolean { color: blue; }
+.null { color: magenta; }
+.key { color: red; }
+
diff --git a/conf.d/project/htdocs/TestBinding.js b/conf.d/project/htdocs/TestBinding.js
new file mode 100644
index 0000000..0f5caf9
--- /dev/null
+++ b/conf.d/project/htdocs/TestBinding.js
@@ -0,0 +1,197 @@
+    var afb = new AFB("api", "mysecret");
+    var ws;
+    var sndcard="HALNotSelected";
+    var evtidx=0;
+    var numid=0;
+
+    function syntaxHighlight(json) {
+        if (typeof json !== 'string') {
+             json = JSON.stringify(json, undefined, 2);
+        }
+        json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+        return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
+            var cls = 'number';
+            if (/^"/.test(match)) {
+                if (/:$/.test(match)) {
+                    cls = 'key';
+                } else {
+                    cls = 'string';
+                }
+            } else if (/true|false/.test(match)) {
+                cls = 'boolean';
+            } else if (/null/.test(match)) {
+                cls = 'null';
+            }
+            return '<span class="' + cls + '">' + match + '</span>';
+        });
+    }
+
+    function getParameterByName(name, url) {
+        if (!url) {
+          url = window.location.href;
+        }
+        name = name.replace(/[\[\]]/g, "\\$&");
+        var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+            results = regex.exec(url);
+        if (!results) return null;
+        if (!results[2]) return '';
+        return decodeURIComponent(results[2].replace(/\+/g, " "));
+    }
+
+    // default soundcard is "PCH"
+    var devid=getParameterByName("devid");
+    if (!devid) devid="hw:1";
+
+    var haldev=getParameterByName("haldev");
+    if (!haldev) haldev="scarlett-usb";
+
+    var sndname=getParameterByName("sndname");
+    if (!sndname) sndname="PCH";
+
+    var mode=getParameterByName("mode");
+    if (!mode) mode="0";
+
+
+
+
+    function replyok(obj) {
+            console.log("replyok:" + JSON.stringify(obj));
+            document.getElementById("output").innerHTML = "OK: "+ syntaxHighlight(obj);
+    }
+
+    function replyerr(obj) {
+            console.log("replyerr:" + JSON.stringify(obj));
+            document.getElementById("output").innerHTML = "ERROR: "+ syntaxHighlight(obj);
+    }
+
+    function gotevent(obj) {
+            console.log("gotevent:" + JSON.stringify(obj));
+            document.getElementById("outevt").innerHTML = (evtidx++) +": "+JSON.stringify(obj);
+    }
+
+    function send(message) {
+            var api = document.getElementById("api").value;
+            var verb = document.getElementById("verb").value;
+            document.getElementById("question").innerHTML = "subscribe: "+api+"/"+verb + " (" + JSON.stringify(message) +")";
+            ws.call(api+"/"+verb, {data:message}).then(replyok, replyerr);
+    }
+
+
+     // On button click from HTML page
+    function callbinder(api, verb, query) {
+            console.log ("subscribe api="+api+" verb="+verb+" query=" +query);
+            var question = urlws +"/" +api +"/" +verb + "?query=" + JSON.stringify(query);
+            document.getElementById("question").innerHTML = syntaxHighlight(question);
+            ws.call(api+"/"+verb, query).then(replyok, replyerr);
+    }
+
+
+    // Retreive Select value and Text from the binder
+    // Note: selection of value/text for a given context is huggly!!!
+    function querySelectList (elemid, api, verb, query) {
+
+        console.log("querySelectList elemid=%s api=%s verb=%s query=%s", elemid, api, verb, query);
+
+        var selectobj = document.getElementById(elemid);
+        if (!selectobj) {
+            return;
+        }
+
+        // onlick update selected HAL api
+        selectobj.onclick=function(){
+           sndcard= this.value;
+           console.log ("Default Selection=" + sndcard);
+        };
+
+        function gotit (result) {
+
+            // display response as for normal onclick action
+            replyok(result);
+            var response=result.response;
+
+            // fulfill select with avaliable active HAL
+            for (idx=0; idx<response.length; idx++) {
+                var opt = document.createElement('option');
+
+                // Alsa LowLevel selection mode
+                if (response[idx].name)  opt.text   = response[idx].name;
+                if (response[idx].devid) opt.value  = response[idx].devid;
+
+                // HAL selection mode
+                if (response[idx].shortname) opt.text  = response[idx].shortname;
+                if (response[idx].api) opt.value = response[idx].api;
+
+                selectobj.appendChild(opt);
+            }
+
+           sndcard= selectobj.value;
+        }
+
+        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
+        document.getElementById("question").innerHTML = syntaxHighlight(question);
+
+        // request lowlevel ALSA to get API list
+        ws.call(api+"/"+verb, query).then(gotit, replyerr);
+    }
+
+    function refresh_list (self, api, verb, query) {
+        console.log("refresh_list id=%s api=%s verb=%s query=%s", self.id, api, verb, query);
+
+        if (self.value > 0) return;
+
+        // onlick update selected HAL api
+        self.onclick=function(){
+           numid = parseInt(self.value);
+           console.log ("Default numid=%d", numid);
+        };
+
+        function gotit (result) {
+
+            // display response as for normal onclick action
+            replyok(result);
+            var response=result.response;
+
+
+
+            // fulfill select with avaliable active HAL
+            for (idx=0; idx<response.length; idx++) {
+                var opt = document.createElement('option');
+
+                // Alsa LowLevel selection mode
+                opt.text   = response[idx].name + ' id=' + response[idx].id;
+                opt.value  = response[idx].id;
+
+                self.appendChild(opt);
+            }
+            self.selectedIndex=2;
+            numid = parseInt (self.value);
+        }
+
+        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
+        document.getElementById("question").innerHTML = syntaxHighlight(question);
+
+        // request lowlevel ALSA to get API list
+        ws.call(api+"/"+verb, query).then(gotit, replyerr);
+    }
+
+
+    function init(elemid, api, verb, query) {
+
+        function onopen() {
+                // check for active HALs
+                querySelectList (elemid, api, verb, query);
+
+                document.getElementById("main").style.visibility = "visible";
+                document.getElementById("connected").innerHTML = "Binder WS Active";
+                document.getElementById("connected").style.background  = "lightgreen";
+                ws.onevent("*", gotevent);
+        }
+
+        function onabort() {
+                document.getElementById("main").style.visibility = "hidden";
+                document.getElementById("connected").innerHTML = "Connected Closed";
+                document.getElementById("connected").style.background  = "red";
+
+        }
+        ws = new afb.ws(onopen, onabort);
+    }
diff --git a/conf.d/project/htdocs/index.html b/conf.d/project/htdocs/index.html
index 9a7d66f..3593d11 100644
--- a/conf.d/project/htdocs/index.html
+++ b/conf.d/project/htdocs/index.html
@@ -1,15 +1,15 @@
 <html>
 <head>
     <title>Simple COntroller Test</title>
-    <link rel="stylesheet" href="AudioBinding.css">
+    <link rel="stylesheet" href="TestBinding.css">
     <script type="text/javascript" src="AFB-websock.js"></script>
-    <script type="text/javascript" src="AudioBinding.js"></script>
+    <script type="text/javascript" src="TestBinding.js"></script>
 </head>
 
 <body onload="init('hal_registry','alsacore', 'hallist')">
 
     <h1>Simple Control Test</h1>
-    <button id="connected" onclick="init()">Binder WS Fail</button> 
+    <button id="connected" onclick="init()">Binder WS Fail</button>
     <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_ctl')">Debug/Monitoring</a></button>
     <br><br>
 
-- 
cgit 1.2.3-korg