X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Fmisc%2Flocal.html;h=ea529fec4ce7be5c8d10627edeffaefc3d2ef7ab;hb=24f7710ba142479e082ac909f84283c0ad8261ce;hp=ae39e7f09c50e91f17efd5d9123e93840d7a8280;hpb=436943f9fee49b1f892480f04f0dc4d5abc5fca0;p=dygraphs.git

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index ae39e7f..ea529fe 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -8,44 +8,89 @@
   <![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/sanity.js"></script>
-  <script type="text/javascript" src="../tests/simple_drawing.js"></script>
-  <script type="text/javascript" src="../tests/range_tests.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/multi_csv.js"></script>
-  <script type="text/javascript" src="../tests/to_dom_coords.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>
+  <script type="text/javascript" src="../tests/date_formats.js"></script>
+  <script type="text/javascript" src="../tests/error_bars.js"></script>
+  <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/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/numeric-labels.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/plugins.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/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/scrolling_div.js"></script>
-  <script type="text/javascript" src="../tests/custom_bars.js"></script>
-  <script type="text/javascript" src="../tests/css.js"></script>
-  <script type="text/javascript" src="../tests/selection.js"></script>
-  <script type="text/javascript" src="../tests/rolling_average.js"></script>
-  <script type="text/javascript" src="../tests/error_bars.js"></script>
-  <script type="text/javascript" src="../tests/annotations.js"></script>
-  <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_while_panning.js"></script>
+  <script type="text/javascript" src="../tests/to_dom_coords.js"></script>
+  <script type="text/javascript" src="../tests/resize.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>
-  <script type="text/javascript" src="../tests/multiple_axes.js"></script>
-  <script type="text/javascript" src="../tests/callback.js"></script>
 
+<style type="text/css">
+  .pass .outcome {
+    color: green;
+  }
 
+  .fail .outcome {
+    color: red;
+  }
+
+  .activeAnchor {
+    color: black;
+    text-decoration: none;
+  }
+</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;
+
   function processVariables() {
     var splitVariables = function() { // http://www.idealog.us/2006/06/javascript_to_p.html
       var query = window.location.search.substring(1); 
@@ -81,76 +126,104 @@
       eval("tc = new " + args.testCase + "()");
     }
 
+    var results = null;
     // If the test class is defined.
     if (tc != null) {
       if (args.command == "runAllTests") {
         console.log("Running all tests for " + args.testCase);
-        postResults(tc.runAllTests());
-      }
-      if (args.command == "runTest") {
+        results = tc.runAllTests();
+      } else if (args.command == "runTest") {
         console.log("Running test " + args.testCase + "." + args.test);
-        postResults(tc.runTest(args.test));
+        results = tc.runTest(args.test);
       }
     } else {
       if (args.command == "runAllTests") {
         console.log("Running all tests for all test cases");
         var testCases = getAllTestCases();
-        var results = {};
+        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);
       }
     }
+    resultsDiv = createResultsDiv();
+    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 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/>";
+  function createResultsDiv() {
+    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/>";
+    body.insertBefore(div, body.firstChild);
+
+    var setByClassName = function(name, displayStyle) {
+      var elements = div.getElementsByClassName(name);
+      for (var i = 0; i < elements.length; i++) {
+        elements[i].style.display = displayStyle;
       }
-      body.insertBefore(div, body.firstChild);
-      first = true;
     }
 
-    var resultToHtml = function(result) {
-      return result ?
-          "<span style='color:green;'>pass</span>" :
-          "<span style='color:red;'>fail</span>";
-    }
+    var passedAnchor = document.getElementById('passed');
+    var failedAnchor = document.getElementById('failed');
+    var allAnchor = document.getElementById('all');
+    passedAnchor.onclick = function() {
+      setByClassName('fail', 'none');
+      setByClassName('pass', 'block');
+
+      passedAnchor.setAttribute("class", 'activeAnchor');
+      failedAnchor.setAttribute("class", '');
+    };
+    failedAnchor.onclick = function() {
+      setByClassName('fail', 'block');
+      setByClassName('pass', 'none');
+      passedAnchor.setAttribute("class", '');
+      failedAnchor.setAttribute("class", 'activeAnchor');
+    };
+    allAnchor.onclick = function() {
+      setByClassName('fail', 'block');
+      setByClassName('pass', 'block');
+      passedAnchor.setAttribute("class", '');
+      failedAnchor.setAttribute("class", '');
+    };
+    return div;
+  }
 
+  function postResults(results, summary, title) {
     if (typeof(results) == "boolean") {
       var elem = document.createElement("div");
-      if (title) {
-        elem.innerHTML = title + ": " + resultToHtml(results);
+      elem.setAttribute("class", results ? 'pass' : 'fail');
+
+      var prefix = title ? (title + ": ") : "";
+      elem.innerHTML = prefix + '<span class=\'outcome\'>' + (results ? 'pass' : 'fail') + '</span>';
+      resultsDiv.appendChild(elem);
+      if (results) {
+        summary.passed++;
       } else {
-        elem.innerHTML = resultToHtml(results);
+        summary.failed++;
       }
-      div.appendChild(elem);
     } 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, div);
+            postResults(results[key], summary, title + "." + key);
           } else {
-            postResults(results[key], key, div);
+            postResults(results[key], summary, key);
           }
         }
       }
     }
-    if (first) {
-      div.appendChild(document.createElement("hr"));
-    }
   }
+
   </script>
 </head>
 <body>
@@ -187,10 +260,10 @@ if (selector != null) { // running a test
   var list = createAttached("ul", selector);
   var parent = list.parentElement;
   var createLink = function(parent, text, url) {
-      var li = createAttached("li", parent);
-      var a = createAttached("a", li);
-      a.innerText = text;
-      a.href = url;
+    var li = createAttached("li", parent);
+    var a = createAttached("a", li);
+    a.innerHTML = text;
+    a.href = url;
   }
   if (tc == null) {
     description.innerHTML = "Test cases:";