X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=auto_tests%2Fmisc%2Flocal.html;h=38413726e1659bc1b7bd6c61e7f0d31fbafbdc88;hb=794e4d006192940a44e2678cb570392017dc9361;hp=3480130ff9af4c38ef2a2760f6b43f882aa1ea4b;hpb=0cb9bd91af9cf5f15d8f27c17835e9bc82bab661;p=dygraphs.git

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index 3480130..3841372 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -8,34 +8,101 @@
   <![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/MoreAsserts.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/dygraph-options-tests.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/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/simple_drawing.js"></script>
+  <script type="text/javascript" src="../tests/step_plot_per_series.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/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>
+
+<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;
+
+  // 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); 
       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;
     }
@@ -44,38 +111,179 @@
     var test = args.test;
     var command = args.command;
 
-    if (args.testCase) {
+    // 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) {
+          var prototype = entry.testCase;
+          tc = new entry.testCase();
+          break;
+        }
+      }
+    } else if (args.testCase) { // The class name of the test.
+      name = args.testCase;
       eval("tc = new " + args.testCase + "()");
-      if (args.command) {
-        if (args.command == "runAllTests") {
-          console.log("Running all tests for " + args.testCase);
-          tc.runAllTests();
+    }
+
+    var results = null;
+    // If the test class is defined.
+    if (tc != null) {
+      if (args.command == "runAllTests") {
+        console.log("Running all tests for " + args.testCase);
+        results = tc.runAllTests();
+      } else if (args.command == "runTest") {
+        console.log("Running test " + args.testCase + "." + args.test);
+        results = 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;
+          tc = new entry.testCase();
+          results[entry.name] = tc.runAllTests();
         }
-        if (args.command == "runTest") {
-          console.log("Running test " + args.testCase + "." + args.test);
-          tc.runTest(args.test);
+      }
+    }
+    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 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;
+      }
+    }
+
+    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");
+      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 {
+        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], summary, title + "." + key);
+          } else {
+            postResults(results[key], summary, key);
+          }
         }
       }
     }
   }
+
   </script>
 </head>
 <body>
   <div id='graph'></div>
-  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,<br>
-  <code>tc = new SimpleDrawingTestCase() ;<br>
-    tc.runTest("testDrawSimpleRangePlusOne")</code>
+  <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, 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/>
 </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);
+    parent.appendChild(elem);
+    return elem;
+  }
+
+  var description = createAttached("div", selector);
+  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.innerHTML = text;
+    a.href = url;
+  }
+  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);
+    }
+  } else {
+    description.innerHTML = "Tests for " + name;
+    var names = tc.getTestNames();
+    createLink(list, "Run All Tests", document.URL + "&command=runAllTests");
+    for (var idx in names) {
+      var name = names[idx];
+      createLink(list, name, document.URL + "&test=" + name + "&command=runTest");
+    }
+  }
+}
 </script>
 </html>