X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=auto_tests%2Ftests%2Faxis_labels-deprecated.js;h=2a8be09ac788efeb6576aae866551e31a86a3596;hb=8021c59f150292bf1a12534e5092451140e49c77;hp=69182981e235391ff56e6bfb77f5a18ee1426ead;hpb=6d6c60b68f7d6b3a58e3f204f2e0e71152f18bd0;p=dygraphs.git

diff --git a/auto_tests/tests/axis_labels-deprecated.js b/auto_tests/tests/axis_labels-deprecated.js
index 6918298..2a8be09 100644
--- a/auto_tests/tests/axis_labels-deprecated.js
+++ b/auto_tests/tests/axis_labels-deprecated.js
@@ -13,32 +13,7 @@ DeprecatedAxisLabelsTestCase.prototype.setUp = function() {
 DeprecatedAxisLabelsTestCase.prototype.tearDown = function() {
 };
 
-// TODO(konigsberg): Scope these functions.
-
-function getYLabels() {
-  var y_labels = document.getElementsByClassName("dygraph-axis-label-y");
-  var ary = [];
-  for (var i = 0; i < y_labels.length; i++) {
-    ary.push(y_labels[i].innerHTML);
-  }
-  return ary;
-}
-
-function getXLabels() {
-  var x_labels = document.getElementsByClassName("dygraph-axis-label-x");
-  var ary = [];
-  for (var i = 0; i < x_labels.length; i++) {
-    ary.push(x_labels[i].innerHTML);
-  }
-  return ary;
-}
-
-function getLegend() {
-  var legend = document.getElementsByClassName("dygraph-legend")[0];
-  return legend.textContent;
-}
-
-DeprecatedAxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter = function() {
+DeprecatedAxisLabelsTestCase.prototype.testDeprecatedDeprecatedXAxisTimeLabelFormatter = function() {
   var opts = {
     width: 480,
     height: 320
@@ -60,14 +35,14 @@ DeprecatedAxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter = function()
     }
   });
 
-  assertEquals(["00:05:00","00:05:12","00:05:24","00:05:36","00:05:48"], getXLabels());
+  assertEquals(["00:05:00","00:05:12","00:05:24","00:05:36","00:05:48"], Util.getXLabels());
 
   // The legend does not use the xAxisLabelFormatter:
   g.setSelection(1);
-  assertEquals('5.1: Y1:1', getLegend());
+  assertEquals('5.1: Y1: 1', Util.getLegend());
 };
 
-DeprecatedAxisLabelsTestCase.prototype.testAxisLabelFormatter = function () {
+DeprecatedAxisLabelsTestCase.prototype.testDeprecatedAxisLabelFormatter = function () {
   var opts = {
     width: 480,
     height: 320,
@@ -94,14 +69,14 @@ DeprecatedAxisLabelsTestCase.prototype.testAxisLabelFormatter = function () {
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
 
-  assertEquals(['x0','x2','x4','x6','x8'], getXLabels());
-  assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], getYLabels());
+  assertEquals(['x0','x2','x4','x6','x8'], Util.getXLabels());
+  assertEquals(["y0","y5","y10","y15"], Util.getYLabels());
 
   g.setSelection(2);
-  assertEquals("2: y:4", getLegend());
+  assertEquals("2: y: 4", Util.getLegend());
 };
 
-DeprecatedAxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () {
+DeprecatedAxisLabelsTestCase.prototype.testDeprecatedDateAxisLabelFormatter = function () {
   var opts = {
     width: 480,
     height: 320,
@@ -110,7 +85,7 @@ DeprecatedAxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function ()
       assertEquals('number', typeof(granularity));
       assertEquals('function', typeof(opts));
       assertEquals('[Dygraph graph]', dg.toString());
-      return 'x' + x.strftime('%Y/%m/%d');
+      return 'x' + Util.formatDate(x);
     },
     yAxisLabelFormatter: function(y, granularity, opts, dg) {
       assertEquals('number', typeof(y));
@@ -119,6 +94,9 @@ DeprecatedAxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function ()
       assertEquals('[Dygraph graph]', dg.toString());
       return 'y' + y;
     },
+    axes: {
+      x: { pixelsPerLabel: 60 }
+    },
     labels: ['x', 'y']
   };
   var data = [];
@@ -128,17 +106,17 @@ DeprecatedAxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function ()
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
 
-  assertEquals(["x2011/01/01", "x2011/01/02", "x2011/01/03", "x2011/01/04", "x2011/01/05", "x2011/01/06", "x2011/01/07", "x2011/01/08", "x2011/01/09"], getXLabels());
-  assertEquals(['y2','y4','y6','y8','y10','y12','y14','y16','y18'], getYLabels());
+  assertEquals(["x2011/01/02"], Util.getXLabels());
+  assertEquals(["y5","y10","y15"], Util.getYLabels());
 
   g.setSelection(0);
-  assertEquals("2011/01/01: y:2", getLegend());
+  assertEquals("2011/01/01: y: 2", Util.getLegend());
 };
 
 // This test verifies that when a valueFormatter is set (but not an
 // axisLabelFormatter), then the valueFormatter is used to format the axis
 // labels.
-DeprecatedAxisLabelsTestCase.prototype.testValueFormatter = function () {
+DeprecatedAxisLabelsTestCase.prototype.testDeprecatedValueFormatter = function () {
   var opts = {
     width: 480,
     height: 320,
@@ -166,16 +144,15 @@ DeprecatedAxisLabelsTestCase.prototype.testValueFormatter = function () {
   var g = new Dygraph(graph, data, opts);
 
   // the valueFormatter options do not affect the ticks.
-  assertEquals(['0','2','4','6','8'], getXLabels());
-  assertEquals(['0','2','4','6','8','10','12','14','16','18'],
-               getYLabels());
+  assertEquals(['0','2','4','6','8'], Util.getXLabels());
+  assertEquals(["0","5","10","15"], Util.getYLabels());
 
   // they do affect the legend, however.
   g.setSelection(2);
-  assertEquals("x2: y:y4", getLegend());
+  assertEquals("x2: y: y4", Util.getLegend());
 };
 
-DeprecatedAxisLabelsTestCase.prototype.testDateValueFormatter = function () {
+DeprecatedAxisLabelsTestCase.prototype.testDeprecatedDateValueFormatter = function () {
   var opts = {
     width: 480,
     height: 320,
@@ -184,7 +161,7 @@ DeprecatedAxisLabelsTestCase.prototype.testDateValueFormatter = function () {
       assertEquals('function', typeof(opts));
       assertEquals('string', typeof(series_name));
       assertEquals('[Dygraph graph]', dg.toString());
-      return 'x' + new Date(x).strftime('%Y/%m/%d');
+      return 'x' + Util.formatDate(x);
     },
     yValueFormatter: function(y, opts, series_name, dg) {
       assertEquals('number', typeof(y));
@@ -193,6 +170,7 @@ DeprecatedAxisLabelsTestCase.prototype.testDateValueFormatter = function () {
       assertEquals('[Dygraph graph]', dg.toString());
       return 'y' + y;
     },
+    axes: { x: { pixelsPerLabel: 60 } },
     labels: ['x', 'y']
   };
 
@@ -204,17 +182,17 @@ DeprecatedAxisLabelsTestCase.prototype.testDateValueFormatter = function () {
   var g = new Dygraph(graph, data, opts);
 
   // valueFormatters do not affect ticks.
-  assertEquals(['01Jan','02Jan','03Jan','04Jan','05Jan','06Jan','07Jan','08Jan','09Jan'], getXLabels());
-  assertEquals(['2','4','6','8','10','12','14','16','18'], getYLabels());
+  assertEquals(["02 Jan"], Util.getXLabels());
+  assertEquals(["5","10","15"], Util.getYLabels());
 
   // the valueFormatter options also affect the legend.
   g.setSelection(2);
-  assertEquals('x2011/01/03: y:y6', getLegend());
+  assertEquals('x2011/01/03: y: y6', Util.getLegend());
 };
 
 // This test verifies that when both a valueFormatter and an axisLabelFormatter
 // are specified, the axisLabelFormatter takes precedence.
-DeprecatedAxisLabelsTestCase.prototype.testAxisLabelFormatterPrecedence = function () {
+DeprecatedAxisLabelsTestCase.prototype.testDeprecatedAxisLabelFormatterPrecedence = function () {
   var opts = {
     width: 480,
     height: 320,
@@ -239,16 +217,16 @@ DeprecatedAxisLabelsTestCase.prototype.testAxisLabelFormatterPrecedence = functi
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
 
-  assertEquals(['x0','x2','x4','x6','x8'], getXLabels());
-  assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], getYLabels());
+  assertEquals(['x0','x2','x4','x6','x8'], Util.getXLabels());
+  assertEquals(["y0","y5","y10","y15"], Util.getYLabels());
 
   g.setSelection(9);
-  assertEquals("xvf9: y:yvf18", getLegend());
+  assertEquals("xvf9: y: yvf18", Util.getLegend());
 };
 
 // This is the same as the previous test, except that options are added
 // one-by-one.
-DeprecatedAxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = function () {
+DeprecatedAxisLabelsTestCase.prototype.testDeprecatedAxisLabelFormatterIncremental = function () {
   var opts = {
     width: 480,
     height: 320,
@@ -281,9 +259,9 @@ DeprecatedAxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = funct
     }
   });
 
-  assertEquals(["x0","x2","x4","x6","x8"], getXLabels());
-  assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], getYLabels());
+  assertEquals(["x0","x2","x4","x6","x8"], Util.getXLabels());
+  assertEquals(["y0","y5","y10","y15"], Util.getYLabels());
 
   g.setSelection(9);
-  assertEquals("xvf9: y:yvf18", getLegend());
+  assertEquals("xvf9: y: yvf18", Util.getLegend());
 };