X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Fmisc%2Flocal.html;h=d24cab801022b51ae0172cb89e4d93d084fc4022;hb=4dd0ac55dc5074a6a935a9174a34ca5e04dcaae3;hp=86216699c3022e4190951eb723c07a9720be08f8;hpb=da11a9a73f133724537aa6e4cb6b624a8a6ed48a;p=dygraphs.git

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index 8621669..d24cab8 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -35,6 +35,7 @@
   <script type="text/javascript" src="../tests/scientific_notation.js"></script>
   <script type="text/javascript" src="../tests/pathological_cases.js"></script>
   <script type="text/javascript" src="../tests/date_formats.js"></script>
+  <script type="text/javascript" src="../tests/formats.js"></script>
   <script type="text/javascript" src="../tests/update_options.js"></script>
   <script type="text/javascript" src="../tests/utils_test.js"></script>
   <script type="text/javascript" src="../tests/multiple_axes.js"></script>
@@ -42,14 +43,17 @@
 
   <script type="text/javascript">
   var tc = null;
+  var name = null;
   function processVariables() {
     var splitVariables = function() { // http://www.idealog.us/2006/06/javascript_to_p.html
       var query = window.location.search.substring(1); 
       var args = {};
       var vars = query.split("&"); 
-      for (var i = 0;i < vars.length; i++) { 
-        var pair = vars[i].split("="); 
-        args[pair[0]] = pair[1];
+      for (var i = 0; i < vars.length; i++) { 
+        if (vars[i].length > 0) {
+          var pair = vars[i].split("="); 
+          args[pair[0]] = pair[1];
+        }
       }
       return args;
     }
@@ -58,8 +62,10 @@
     var test = args.test;
     var command = args.command;
 
+    // args.testCaseName uses the string name of the test.
     if (args.testCaseName) {
       var testCases = getAllTestCases();
+      name = args.testCaseName;
       for (var idx in testCases) {
         var entry = testCases[idx];
         if (entry.name == args.testCaseName) {
@@ -68,27 +74,49 @@
           break;
         }
       }
-    } else if (args.testCase) {
+    } else if (args.testCase) { // The class name of the test.
+      name = args.testCase;
       eval("tc = new " + args.testCase + "()");
     }
+
+    // If the test class is defined.
     if (tc != null) {
-      if (args.command) {
-        if (args.command == "runAllTests") {
-          console.log("Running all tests for " + args.testCase);
-          postResults(tc.runAllTests());
-        }
-        if (args.command == "runTest") {
-          console.log("Running test " + args.testCase + "." + args.test);
-          postResults(tc.runTest(args.test));
+      if (args.command == "runAllTests") {
+        console.log("Running all tests for " + args.testCase);
+        postResults(tc.runAllTests());
+      }
+      if (args.command == "runTest") {
+        console.log("Running test " + args.testCase + "." + args.test);
+        postResults(tc.runTest(args.test));
+      }
+    } else {
+      if (args.command == "runAllTests") {
+        console.log("Running all tests for all test cases");
+        var testCases = getAllTestCases();
+        var results = {};
+        for (var idx in testCases) {
+          var entry = testCases[idx];
+          var prototype = entry.testCase;
+          tc = new entry.testCase();
+          results[entry.name] = tc.runAllTests();
         }
+        postResults(results);
       }
     }
   }
 
-  function postResults(results) {
-    var body = document.getElementsByTagName("body")[0];
-    var div = document.createElement("div");
-    body.insertBefore(div, body.firstChild);
+  function postResults(results, title, div) {
+    var first = false;
+    if (div == null) {
+      var body = document.getElementsByTagName("body")[0];
+      div = document.createElement("div");
+      div.innerHTML = "Test results:";
+      if (typeof(results) != "boolean"); {
+        div.innerHTML = "Test results:<br/>";
+      }
+      body.insertBefore(div, body.firstChild);
+      first = true;
+    }
 
     var resultToHtml = function(result) {
       return result ?
@@ -97,41 +125,55 @@
     }
 
     if (typeof(results) == "boolean") {
-      div.innerHTML = "Test results: " + resultToHtml(results);
+      var elem = document.createElement("div");
+      if (title) {
+        elem.innerHTML = title + ": " + resultToHtml(results);
+      } else {
+        elem.innerHTML = resultToHtml(results);
+      }
+      div.appendChild(elem);
     } else { // hash
       var html = "";
       for (var key in results) {
         if (results.hasOwnProperty(key)) {
-          html = html + key + ": " + resultToHtml(results[key]) + "<br/>";
+          var elem = results[key];
+          if (typeof(elem) == "boolean" && title) {
+            postResults(results[key], title + "." + key, div);
+          } else {
+            postResults(results[key], key, div);
+          }
         }
       }
-      div.innerHTML = "Test results:<br/>" + html;
     }
-    div.appendChild(document.createElement("hr"));
+    if (first) {
+      div.appendChild(document.createElement("hr"));
+    }
   }
   </script>
 </head>
 <body>
   <div id='graph'></div>
+  <div id="selector"></div>
   <p>This file is really nothing more than all the tests coalesced into a single
-  HTML file. To run a test, open a Javascript console and execute, for
-  instance,</p>
+  HTML file. To run a test, use the selector above, or
+  open a Javascript console and execute, for instance,</p>
   <code>testDrawSimpleRangePlusOne()</code>
 
   <p>Alternatively you can use query args: <ul>
-  <li>testCase - for the name of the test case
+  <li>testCase - for the name of the test case prototype
+  <li>testCaseName - for the name of the test case
   <li>test - for the name of the test (use command=runTest)
   <li>command - either runTest or runAllTests.
   </ul>
   Example: <code>local.html?testCase=ScrollingDivTestCase&test=testNestedDiv_Scrolled&command=runTest</code>
   <p/>
-  <div id="selector"></div>
 </body>
 <script>
 processVariables();
 addGlobalTestSymbols();
 
 var selector = document.getElementById("selector");
+
 if (selector != null) { // running a test
   var createAttached = function(name, parent) {
     var elem = document.createElement(name);
@@ -151,6 +193,7 @@ if (selector != null) { // running a test
   if (tc == null) {
     description.innerHTML = "Test cases:";
     var testCases = getAllTestCases();
+    createLink(list, "(run all tests)", document.URL + "?command=runAllTests");
     for (var idx in testCases) {
       var entryName = testCases[idx].name;
       createLink(list, entryName, document.URL + "?testCaseName=" + entryName);