X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=testing%2Fqunit%2Funit-tests.js;fp=testing%2Fqunit%2Funit-tests.js;h=12bb76ad2c8c680a29411c821cef0bd09e1ea8b0;hb=34ec9353b52472aabc2b42ec0861e004c50b76eb;hp=2bab3f835d0c37a6a6d742c8052cebd22bfc925f;hpb=8d2b79e26696ee059454a41c91cb272b5d5faa00;p=matches%2FMCTX3420.git

diff --git a/testing/qunit/unit-tests.js b/testing/qunit/unit-tests.js
index 2bab3f8..12bb76a 100644
--- a/testing/qunit/unit-tests.js
+++ b/testing/qunit/unit-tests.js
@@ -2,12 +2,17 @@
  * MCTX3420 2013 - Remote pressurised can experiment.
  * Unit testing for the server API.
  * These unit tests use the QUnit unit testing framework.
- * @requires QUnit and jQuery
+ * @requires QUnit, jQuery, and base64.js
  * @date 28/8/13
  * @author Jeremy Tan
  */
 
-var api = location.protocol + "//" +  location.host + "/api/";
+//Namespace ut
+
+ut = {};
+ut.api = location.protocol + "//" +  location.host + "/api/";
+ut.ckey = undefined;
+ut.controlcb = $.Callbacks();
 
 /**
  * Sends an AJAX query to the API
@@ -15,54 +20,38 @@ var api = location.protocol + "//" +  location.host + "/api/";
  * @param {Object} opts Object holding the parameters, username, password and
  *                 callback. The parameters should be an object of key/value
  *                 pairs.
- * @returns JSON data
+ * @returns jqXHR object (but calls callback with JSON data, or null on AJAX error)
  */
 function query(module, opts) {
-  function buildQuery(opts) {
-    var result = "?";
-    var first = true;
-    
-    for (key in opts) {
-      if (!first) 
-        result += "&";
-      else 
-        first = false;
-      result += encodeURIComponent(key) + 
-                ((opts[key] !== undefined) ? "=" + encodeURIComponent(opts[key]) : "");
-    }
-    return result;
-  }
-  
-  var queryurl = api + module;
-  if (opts.params)
-    queryurl += buildQuery(opts.params);
+  var queryurl = ut.api + module;
   
   var authfunc;
   if (opts.username) {
     authfunc = function(xhr) {
       xhr.setRequestHeader("Authorization",
-        "Basic " + btoa(opts.username + ":" + opts.password));
+        "Basic " + base64.encode(opts.username + ":" + opts.password));
     };
   }
   
-  $.ajax({
+  return $.ajax({
     url: queryurl,
     type: 'GET',
     dataType: 'json',
-    beforeSend: authfunc
+    data: opts.params,
+    beforeSend: authfunc,
+    async: opts.async
   }).done(opts.callback)
     .fail(function(jqXHR) {
-      alert("Request Failed!");
       ok(false, "Request failed: " + jqXHR.status.toString() + " " + jqXHR.statusText);
       opts.callback(null);
     });
 }
 
 QUnit.module("API basics");
-QUnit.asyncTest("Existence (identify)", function () {
+QUnit.asyncTest("API Existence (identify)", function () {
   query("identify", {callback : function(data) {
    start();
-   ok(data.status >= 0, "Return status");
+   ok(data.status > 0, "Return status");
    ok(data.description, data.description);
    ok(data.build_date, data.build_date);
   }});
@@ -79,7 +68,7 @@ QUnit.module("Sensors");
 QUnit.asyncTest("Existence", function() {
   query("sensors", {params : {id : 0}, callback : function(data) {
    start();
-   ok(data.status >= 0, "Return status");
+   ok(data.status > 0, "Return status");
    ok(data.data !== undefined, "Data field existence");
    var result = "Data: ";
    for (var i = 0; i < data.data.length; i++) {
@@ -103,15 +92,50 @@ QUnit.asyncTest("Invalid sensor id 2", function() {
   }});  
 });
 
+QUnit.asyncTest("Out of bounds sensor id 1", function() {
+  query("sensors", {params : {id : "-1"}, callback : function(data) {
+   start();
+   ok(data.status < 0, "Return status");
+  }});  
+});
+
+QUnit.asyncTest("Out of bounds sensor id 2", function() {
+  query("sensors", {params : {id : "999"}, callback : function(data) {
+   start();
+   ok(data.status < 0, "Return status");
+  }});  
+});
+
 QUnit.module("Controls and access");
 QUnit.asyncTest("Gaining access", function() {
-  query("control", {params : {action : "start", force : true}, 
-                  username : "mctxadmin", password : "admin", 
-                  callback : function(data) {
-   start();
-   ok(data.status >= 0, "Return status");
-   
-   var key = data.key;
-   
-  }});
+  ut.controlcb.add(function () {
+    query("control", {params : {action : "start", force : true}, 
+                    username : $("#username").val(), password : $("#password").val(),
+                    async : false, 
+                    callback : function(data) {
+     start();
+     ok(data.status > 0, "Return status");
+     ut.ckey = data.key;
+    }});
+  });
+});
+
+QUnit.asyncTest("Setting actuator value", function () {
+  ut.controlcb.add(function () {
+    query("control", {params : {action : "set", id : 0,
+          username : $("#username").val(), password : $("#password").val(),
+          value : 200, key : ut.ckey},
+        callback : function(data) {
+          start();
+          ok(data.status > 0, "Return status");
+          ok(true, data.description);
+    }});
+  });
 });
+
+$(document).ready(function(){
+  $("#control").submit(function () {
+    ut.controlcb.fire();
+    return false;
+  });
+});
\ No newline at end of file