Rewrite local testdriver processing. Using a listener framework to report test result...

diff --git a/auto_tests/misc/fake-jstestdriver.js b/auto_tests/misc/fake-jstestdriver.js
index 6f4f464..404d165 100644 (file)
--- a/auto_tests/misc/fake-jstestdriver.js
+++ b/auto_tests/misc/fake-jstestdriver.js
@@ -24,7 +24,19 @@
  * @author konigsberg@google.com (Robert Konigsberg)
  */
 var jstestdriver = {
-  jQuery : jQuery
+  jQuery : jQuery,
+  listeners_ : [],
+  announce_ : function(name, args) {
+    for (var idx = 0; idx < jstestdriver.listeners_.length; idx++) {
+      var listener = jstestdriver.listeners_[idx];
+      if (listener[name]) {
+        listener[name].apply(null, args);
+      }
+    }
+  },
+  attachListener: function(listener) {
+    jstestdriver.listeners_.push(listener);
+  }
 };
 
 if (!console) {
@@ -55,6 +67,7 @@ function TestCase(name) {
 
   testCase.prototype.setUp = function() { };
   testCase.prototype.tearDown = function() { };
+  testCase.prototype.name = name;
   /**
    * name can be a string, which is looked up in this object, or it can be a
    * function, in which case it's run.
@@ -68,29 +81,34 @@ function TestCase(name) {
    * Chrome's console completion.
    */
   testCase.prototype.runTest = function(func) {
+    var result = false;
+    var ex = null;
+    var name = typeof(func) == "string" ? func : "(anonymous function)";
+    jstestdriver.announce_("start", [this, name]);
     try {
-      this.setUp();
-
-      var fn = null;
-      var parameterType = typeof(func);
-      if (typeof(func) == "function") {
-        fn = func;
-      } else if (typeof(func) == "string") {
-        fn = this[func];
-      } else {
-        fail("can't supply " + typeof(func) + " to runTest");
-      }
-
-      fn.apply(this, []);
-      this.tearDown();
-      return true;
+      result = this.runTest_(func);
     } catch (e) {
-      console.log(e);
-      if (e.stack) {
-        console.log(e.stack);
-      }
-      return false;
+      ex = e;
     }
+    jstestdriver.announce_("finish", [this, name, result, ex]);
+  }
+
+  testCase.prototype.runTest_ = function(func) {
+    this.setUp();
+
+    var fn = null;
+    var parameterType = typeof(func);
+    if (typeof(func) == "function") {
+      fn = func;
+    } else if (typeof(func) == "string") {
+      fn = this[func];
+    } else {
+      fail("can't supply " + typeof(func) + " to runTest");
+    }
+
+    fn.apply(this, []);
+    this.tearDown();
+    return true;
   };
 
   testCase.prototype.runAllTests = function() {
@@ -152,3 +170,15 @@ function addGlobalTestSymbols() {
 function getAllTestCases() {
   return testCaseList;
 }
+
+jstestdriver.attachListener({
+  finish : function(tc, name, result, e) {
+    if (e) {
+      console.log(e);
+      if (e.stack) {
+        console.log(e.stack);
+      }
+    }
+  }
+});
+

diff --git a/auto_tests/misc/local.js b/auto_tests/misc/local.js
index 6b0e398..f53ce38 100644 (file)
--- a/auto_tests/misc/local.js
+++ b/auto_tests/misc/local.js
@@ -1,7 +1,19 @@
 var DygraphsLocalTester = function() {
   this.tc = null; // Selected test case
   this.name = null; 
-  this.resultDiv = null;
+  this.resultsDiv = null;
+  this.results = [];
+  this.summary = { failed: 0, passed: 0 };
+
+  var self = this;
+  jstestdriver.attachListener({
+    start : function(tc) {
+      self.start_(tc);
+    },
+    finish : function(tc, name, result, e) {
+      self.finish_(tc, name, result, e);
+    }
+  });
 };
 
 /**
@@ -49,50 +61,49 @@ DygraphsLocalTester.prototype.processVariables = function() {
       var entry = testCases[idx];
       if (entry.name == args.testCaseName) {
         var prototype = entry.testCase;
-        tc = new entry.testCase();
+        this.tc = new entry.testCase();
         break;
       }
     }
   } else if (args.testCase) { // The class name of the test.
     name = args.testCase;
-    eval("tc = new " + args.testCase + "()");
+    eval("tc__= new " + args.testCase + "()");
+    this.tc = tc_;
   }
 
-  var results = null;
   // If the test class is defined.
   if (this.tc != null) {
     if (args.command == "runAllTests") {
       console.log("Running all tests for " + args.testCase);
-      results = this.tc.runAllTests();
+      this.tc.runAllTests();
     } else if (args.command == "runTest") {
       console.log("Running test " + args.testCase + "." + args.test);
-      results = this.tc.runTest(args.test);
+      this.tc.runTest(args.test);
     }
   } else {
     if (args.command == "runAllTests") {
       console.log("Running all tests for all test cases");
       var testCases = getAllTestCases();
-      results = {};
       for (var idx in testCases) {
         var entry = testCases[idx];
         var prototype = entry.testCase;
         this.tc = new entry.testCase();
-        results[entry.name] = this.tc.runAllTests();
+        this.tc.runAllTests();
       }
     }
   }
   this.resultsDiv = this.createResultsDiv();
-  var summary = { failed: 0, passed: 0 };
-  this.postResults(results, summary);
+  this.postResults();
   this.resultsDiv.appendChild(document.createElement("hr"));
-  document.getElementById('summary').innerHTML = "(" + summary.failed + " failed, " + summary.passed + " passed)";
+  document.getElementById('summary').innerHTML = "(" + this.summary.failed + " failed, " + this.summary.passed + " passed)";
 }
 
 DygraphsLocalTester.prototype.createResultsDiv = function() {
-  var body = document.getElementsByTagName("body")[0];
   div = document.createElement("div");
   div.id='results';
   div.innerHTML = "Test results: <span id='summary'></span> <a href='#' id='passed'>passed</a> <a href='#' id='failed'>failed</a> <a href='#' id='all'>all</a><br/>";
+
+  var body = document.getElementsByTagName("body")[0];
   body.insertBefore(div, body.firstChild);
 
   var setByClassName = function(name, displayStyle) {
@@ -127,32 +138,17 @@ DygraphsLocalTester.prototype.createResultsDiv = function() {
   return div;
 }
 
-DygraphsLocalTester.prototype.postResults = function(results, summary, title) {
-  if (typeof(results) == "boolean") {
+DygraphsLocalTester.prototype.postResults = function() {
+  for (var idx = 0; idx < this.results.length; idx++) {
+    var result = this.results[idx];
     var elem = document.createElement("div");
-    elem.setAttribute("class", results ? 'pass' : 'fail');
+    elem.setAttribute("class", result.result ? 'pass' : 'fail');
 
-    var prefix = title ? (title + ": ") : "";
-    elem.innerHTML = prefix + '<span class=\'outcome\'>' + (results ? 'pass' : 'fail') + '</span>';
+    elem.innerHTML = result.name + ': <span class=\'outcome\'>' +
+      (result.result ? 'pass' : 'fail') +
+      '</span>' +
+      ' (' + result.duration + ' ms)';
     this.resultsDiv.appendChild(elem);
-    if (results) {
-      summary.passed++;
-    } else {
-      summary.failed++;
-    }
-  } else { // hash
-    var failed = 0;
-    var html = "";
-    for (var key in results) {
-      if (results.hasOwnProperty(key)) {
-        var elem = results[key];
-        if (typeof(elem) == "boolean" && title) {
-          this.postResults(results[key], summary, title + "." + key);
-        } else {
-          this.postResults(results[key], summary, key);
-        }
-      }
-    }
   }
 }
 
@@ -185,7 +181,7 @@ DygraphsLocalTester.prototype.run = function() {
       }
     } else {
       description.innerHTML = "Tests for " + name;
-      var names = tc.getTestNames();
+      var names = this.tc.getTestNames();
       createLink(list, "Run All Tests", document.URL + "&command=runAllTests");
       for (var idx in names) {
         var name = names[idx];
@@ -194,3 +190,18 @@ DygraphsLocalTester.prototype.run = function() {
     }
   }
 }
+
+DygraphsLocalTester.prototype.start_ = function(tc) {
+  this.startms_ = new Date().getTime();
+}
+
+DygraphsLocalTester.prototype.finish_ = function(tc, name, result, e) {
+  var endms_ = new Date().getTime();
+  this.results.push({
+    name : tc.name + "." + name,
+    result : result,
+    duration : endms_ - this.startms_
+  });
+  this.summary.passed += result ? 1 : 0;
+  this.summary.failed += result ? 0 : 1;
+}