X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Fmisc%2Ffake-jstestdriver.js;h=6f4f464afad1c2ed75f4797bcc9c2ef3e768d7ce;hb=d66c74ef29a8ad222e7203911af1b46b37f5bde1;hp=9ca10cd19464f1d40805f2ca45556e703aad35d7;hpb=9d076ffecc3dc9cc3a8ef411fa8ee61d54b2c3bf;p=dygraphs.git

diff --git a/auto_tests/misc/fake-jstestdriver.js b/auto_tests/misc/fake-jstestdriver.js
index 9ca10cd..6f4f464 100644
--- a/auto_tests/misc/fake-jstestdriver.js
+++ b/auto_tests/misc/fake-jstestdriver.js
@@ -27,6 +27,14 @@ var jstestdriver = {
   jQuery : jQuery
 };
 
+if (!console) {
+  var console = {
+    log: function(x) {
+      // ...
+    }
+  };
+}
+
 var jstd = {
   include : function(name) {
     this.sucker("Not including " + name);
@@ -36,39 +44,111 @@ var jstd = {
   }
 };
 
+var testCaseList = [];
+
 function TestCase(name) {
-  jstd.sucker("Not really creating TestCase(" + name + ")");
-  this.name = name;
-  this.toString = function() {
+  var testCase = function() { return this; };
+  testCase.name = name;
+  testCase.toString = function() {
     return "Fake test case " + name;
   };
 
-  var testCase = function() { return this; };
   testCase.prototype.setUp = function() { };
   testCase.prototype.tearDown = function() { };
-  testCase.prototype.runTest = function(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.
+   *
+   * Examples:
+   * var tc = new MyTestCase();
+   * tc.runTest("testThis");
+   * tc.runTest(tc.testThis);
+   *
+   * The duplication tc in runTest is irritating, but it plays well with
+   * Chrome's console completion.
+   */
+  testCase.prototype.runTest = function(func) {
     try {
       this.setUp();
-      var fn = this[name];
+
+      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;
     } catch (e) {
-      console.log(e.stack);
+      console.log(e);
+      if (e.stack) {
+        console.log(e.stack);
+      }
       return false;
     }
   };
+
   testCase.prototype.runAllTests = function() {
+    var results = {};
+    var names = this.getTestNames();
+    for (var idx in names) {
+      var name = names[idx];
+      console.log("Running " + name);
+      var result = this.runTest(name);
+      results[name] = result;
+    }
+    console.log(prettyPrintEntity_(results));
+    return results;
+  };
+
+  testCase.prototype.getTestNames = function() {
     // what's better than for ... in for non-array objects?
-    var tests = {};
+    var tests = [];
     for (var name in this) {
       if (name.indexOf('test') == 0 && typeof(this[name]) == 'function') {
-        console.log("Running " + name);
-        var result = this.runTest(name);
-        tests[name] = result;
+        tests.push(name);
       }
     }
-    console.log(prettyPrintEntity_(tests));
-  };
+    return tests;
+  }
+
+  testCaseList.push({name : name, testCase : testCase});
   return testCase;
 };
+
+// Note: this creates a bunch of global variables intentionally.
+function addGlobalTestSymbols() {
+  globalTestDb = {};  // maps test name -> test function wrapper
+
+  var num_tests = 0;
+  for (var i = 0; i < testCaseList.length; i++) {
+    var tc_class = testCaseList[i].testCase;
+    for (var name in tc_class.prototype) {
+      if (name.indexOf('test') == 0 && typeof(tc_class.prototype[name]) == 'function') {
+        if (globalTestDb.hasOwnProperty(name)) {
+          console.log('Duplicated test name: ' + name);
+        } else {
+          globalTestDb[name] = function(name, tc_class) {
+            return function() {
+              var tc = new tc_class;
+              return tc.runTest(name);
+            };
+          }(name, tc_class);
+          eval(name + " = globalTestDb['" + name + "'];");
+          num_tests += 1;
+        }
+      }
+    }
+  }
+  console.log('Loaded ' + num_tests + ' tests in ' +
+              testCaseList.length + ' test cases');
+}
+
+function getAllTestCases() {
+  return testCaseList;
+}