X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Fmisc%2Flocal.html;h=0d4fe45df295bbc33dd4e78e48510049a7b67412;hb=dd371798a58578e470de0a7e292ca5ca550aa3f3;hp=076e3ecc17e7714444fbe32d120c0d1167b45c9e;hpb=cea0fb7058918a6d81839987e9974d22790bdf34;p=dygraphs.git

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index 076e3ec..0d4fe45 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -8,15 +8,20 @@
   <![endif]-->
   <script type="text/javascript" src="../../dygraph-dev.js"></script>
 
-  <!-- Scripts for automated tests -->
+  <!-- Scripts for library support -->
   <script type="text/javascript" src="../lib/jquery-1.4.2.js"></script>
   <script type="text/javascript" src="../lib/Asserts.js"></script>
   <script type="text/javascript" src="fake-jstestdriver.js"></script>
   <script type="text/javascript" src="../tests/Proxy.js"></script>
   <script type="text/javascript" src="../tests/CanvasAssertions.js"></script>
   <script type="text/javascript" src="../tests/DygraphOps.js"></script>
+  <script type="text/javascript" src="../tests/PixelSampler.js"></script>
+  <script type="text/javascript" src="../tests/Util.js"></script>
+
+  <!-- Scripts for automated tests -->
   <script type="text/javascript" src="../tests/annotations.js"></script>
   <script type="text/javascript" src="../tests/axis_labels.js"></script>
+  <script type="text/javascript" src="../tests/axis_labels-deprecated.js"></script>
   <script type="text/javascript" src="../tests/callback.js"></script>
   <script type="text/javascript" src="../tests/css.js"></script>
   <script type="text/javascript" src="../tests/custom_bars.js"></script>
@@ -25,24 +30,28 @@
   <script type="text/javascript" src="../tests/formats.js"></script>
   <script type="text/javascript" src="../tests/interaction_model.js"></script>
   <script type="text/javascript" src="../tests/missing_points.js"></script>
-  <script type="text/javascript" src="../tests/multiple_axes.js"></script>
   <script type="text/javascript" src="../tests/multi_csv.js"></script>
+  <script type="text/javascript" src="../tests/multiple_axes.js"></script>
+  <script type="text/javascript" src="../tests/multiple_axes-old.js"></script>
   <script type="text/javascript" src="../tests/no_hours.js"></script>
+  <script type="text/javascript" src="../tests/parser.js"></script>
   <script type="text/javascript" src="../tests/pathological_cases.js"></script>
-
+  <script type="text/javascript" src="../tests/per_series.js"></script>
+  <script type="text/javascript" src="../tests/range_selector.js"></script>
   <script type="text/javascript" src="../tests/range_tests.js"></script>
   <script type="text/javascript" src="../tests/rolling_average.js"></script>
   <script type="text/javascript" src="../tests/sanity.js"></script>
-  <script type="text/javascript" src="../tests/selection.js"></script>
   <script type="text/javascript" src="../tests/scientific_notation.js"></script>
   <script type="text/javascript" src="../tests/scrolling_div.js"></script>
+  <script type="text/javascript" src="../tests/selection.js"></script>
   <script type="text/javascript" src="../tests/simple_drawing.js"></script>
+  <script type="text/javascript" src="../tests/stacked.js"></script>
   <!--
   <script type="text/javascript" src="../tests/tickers.js"></script>
   -->
   <script type="text/javascript" src="../tests/to_dom_coords.js"></script>
-  <script type="text/javascript" src="../tests/update_while_panning.js"></script>
   <script type="text/javascript" src="../tests/update_options.js"></script>
+  <script type="text/javascript" src="../tests/update_while_panning.js"></script>
   <script type="text/javascript" src="../tests/utils_test.js"></script>
 
 <style type="text/css">
@@ -60,8 +69,22 @@
   }
 </style>
   <script type="text/javascript">
-  var tc = null;
-  var name = null;
+
+  // save Dygraph.warn so we can catch warnings.
+  if (false) { // Set true if you want warnings to cause failures.
+    var originalDygraphWarn = Dygraph.warn;
+    Dygraph.warn = function(msg) {
+      if (msg == "Using default labels. Set labels explicitly via 'labels' in the options parameter") {
+        originalDygraphWarn(msg);
+        return;
+      }
+      throw "Warnings not permitted: " + msg;
+    }
+    Dygraph.prototype.warn = Dygraph.warn;
+  }
+
+  var tc = null; // Selected test case
+  var name = null; 
 
   var resultDiv = null;
 
@@ -124,15 +147,17 @@
       }
     }
     resultsDiv = createResultsDiv();
-    postResults(results);
+    var summary = { failed: 0, passed: 0 };
+    postResults(results, summary);
     resultsDiv.appendChild(document.createElement("hr"));
+    document.getElementById('summary').innerHTML = "(" + summary.failed + " failed, " + summary.passed + " passed)";
   }
 
   function createResultsDiv() {
     var body = document.getElementsByTagName("body")[0];
     div = document.createElement("div");
     div.id='results';
-    div.innerHTML = "Test results: <a href='#' id='passed'>passed</a> <a href='#' id='failed'>failed</a> <a href='#' id='all'>all</a><br/>";
+    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/>";
     body.insertBefore(div, body.firstChild);
 
     var setByClassName = function(name, displayStyle) {
@@ -167,7 +192,7 @@
     return div;
   }
 
-  function postResults(results, title) {
+  function postResults(results, summary, title) {
     if (typeof(results) == "boolean") {
       var elem = document.createElement("div");
       elem.setAttribute("class", results ? 'pass' : 'fail');
@@ -175,15 +200,21 @@
       var prefix = title ? (title + ": ") : "";
       elem.innerHTML = prefix + '<span class=\'outcome\'>' + (results ? 'pass' : 'fail') + '</span>';
       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) {
-            postResults(results[key], title + "." + key);
+            postResults(results[key], summary, title + "." + key);
           } else {
-            postResults(results[key], key);
+            postResults(results[key], summary, key);
           }
         }
       }
@@ -228,7 +259,7 @@ if (selector != null) { // running a test
   var createLink = function(parent, text, url) {
     var li = createAttached("li", parent);
     var a = createAttached("a", li);
-    a.innerText = text;
+    a.innerHTML = text;
     a.href = url;
   }
   if (tc == null) {