From: Robert Konigsberg <konigsberg@google.com>
Date: Sun, 2 Jun 2013 15:43:08 +0000 (-0400)
Subject: The local auto tester's javascript is messy and having it embedded in HTML doesn... 
X-Git-Tag: v1.0.0~27^2~5^2~3
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=243eecfbc577151058204c4783098ac26016b3cb;p=dygraphs.git

The local auto tester's javascript is messy and having it embedded in HTML doesn't help, so this change moves it out into its own file.
---

diff --git a/auto_tests/misc/local.html b/auto_tests/misc/local.html
index e168de0..83e55db 100644
--- a/auto_tests/misc/local.html
+++ b/auto_tests/misc/local.html
@@ -17,6 +17,7 @@
   <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>
+  <script type="text/javascript" src="local.js"></script>
 
   <!-- Scripts for automated tests -->
   <script type="text/javascript" src="../tests/annotations.js"></script>
@@ -74,160 +75,6 @@
     text-decoration: none;
   }
 </style>
-  <script type="text/javascript">
-
-  // 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++) { 
-        if (vars[i].length > 0) {
-          var pair = vars[i].split("="); 
-          args[pair[0]] = pair[1];
-        }
-      }
-      return args;
-    }
-
-    var args = splitVariables();
-    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) {
-          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 + "()");
-    }
-
-    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();
-        }
-      }
-    }
-    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>
@@ -246,45 +93,10 @@
   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 type="text/javascript">
+  overrideWarn();
+  processVariables();
+  addGlobalTestSymbols();
+  run();
 </script>
 </html>
diff --git a/auto_tests/misc/local.js b/auto_tests/misc/local.js
new file mode 100644
index 0000000..4cfd41d
--- /dev/null
+++ b/auto_tests/misc/local.js
@@ -0,0 +1,191 @@
+var overrideWarn = function() {
+  // 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++) { 
+      if (vars[i].length > 0) {
+        var pair = vars[i].split("="); 
+        args[pair[0]] = pair[1];
+      }
+    }
+    return args;
+  }
+
+  var args = splitVariables();
+  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) {
+        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 + "()");
+  }
+
+  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();
+      }
+    }
+  }
+  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);
+        }
+      }
+    }
+  }
+}
+
+var run = function() {
+  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");
+      }
+    }
+  }
+}