update reference to drawGrid option

[dygraphs.git] / auto_tests / tests / step_plot_per_series.js

diff --git a/auto_tests/tests/step_plot_per_series.js b/auto_tests/tests/step_plot_per_series.js
index 7a6d96d..9d278a2 100644 (file)
--- a/auto_tests/tests/step_plot_per_series.js
+++ b/auto_tests/tests/step_plot_per_series.js
@@ -1,9 +1,14 @@
 /**
  * @fileoverview Test cases for the option "stepPlot" especially for the scenario where the option is not set for the whole graph but for single series.
  *
+ * TODO(danvk): delete this test once dpxdt screenshot tests are part of the
+ *     main dygraphs repo. The tests have extremely specific expectations about
+ *     how drawing is performed. It's more realistic to test the resulting
+ *     pixels.
+ *
  * @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG)
  */
-var StepTestCase = TestCase("step_plot_per_series");
+var StepTestCase = TestCase("step-plot-per-series");
 
 StepTestCase.prototype.setUp = function() {
   document.body.innerHTML = "<div id='graph'></div>";
@@ -26,10 +31,16 @@ StepTestCase.prototype.testMixedModeStepAndLineFilled = function() {
   var opts = {
     width: 480,
     height: 320,
-    drawXGrid: false,
-    drawYGrid: false,
-    drawXAxis: false,
-    drawYAxis: false,
+    axes : {
+      x : {
+        drawGrid: false,
+        drawAxis: false,
+      },
+      y : {
+        drawGrid: false,
+        drawAxis: false,
+      }
+    },
     errorBars: false,
     labels: ["X", "Idle", "Used"],
     series: {
@@ -89,10 +100,16 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
   var opts = {
     width: 480,
     height: 320,
-    drawXGrid: false,
-    drawYGrid: false,
-    drawXAxis: false,
-    drawYAxis: false,
+    axes : {
+      x : {
+        drawGrid: false,
+        drawAxis: false,
+      },
+      y : {
+        drawGrid: false,
+        drawAxis: false,
+      }
+    },
     errorBars: false,
     labels: ["X", "Idle", "Used", "NotUsed", "Active"],
     series: {
@@ -131,7 +148,6 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     var y1 = data[i][4];
     var y2 = data[i + 1][4];
 
-
     // Fourth series (step)
     // Test lines
     // Horizontal line
@@ -149,16 +165,15 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x2, y2base);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
     
     y1base = y1;
-    y2base = y2;
+    y2base = y1;
     y1 += data[i][3];
     y2 += data[i + 1][3];
     
@@ -174,13 +189,12 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x2, y2base);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
     
     y1base = y1;
     y2base = y2;
@@ -204,16 +218,15 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x2, y2base);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
     
     y1base = y1;
-    y2base = y2;
+    y2base = y1;
     y1 += data[i][1];
     y2 += data[i + 1][1];
 
@@ -229,13 +242,12 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() {
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x2, y2base);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     xy1 = xy2;
     xy2 = g.toDomCoords(x1, y1base);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    xy1 = xy2;
-    xy2 = g.toDomCoords(x1, y1);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
   }
 };
 
@@ -243,10 +255,16 @@ StepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() {
   var opts = {
     width: 480,
     height: 320,
-    drawXGrid: false,
-    drawYGrid: false,
-    drawXAxis: false,
-    drawYAxis: false,
+    axes : {
+      x : {
+        drawGrid: false,
+        drawAxis: false,
+      },
+      y : {
+        drawGrid: false,
+        drawAxis: false,
+      }
+    },
     errorBars: true,
     sigma: 1,
     labels: ["X", "Data1", "Data2"],
@@ -284,34 +302,32 @@ StepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() {
     var y1_bottom = y1_middle - data[i][1][1];
     var y2_bottom = y2_middle - data[i + 1][1][1];
     // Bottom line
-    // Horizontal line
     var xy1 = g.toDomCoords(x1, y1_bottom);
     var xy2 = g.toDomCoords(x2, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_bottom);
-    xy2 = g.toDomCoords(x2, y2_bottom);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
 
     // Top line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_top);
     xy2 = g.toDomCoords(x2, y1_top);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_top);
-    xy2 = g.toDomCoords(x2, y2_top);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
 
     // Middle line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_middle);
     xy2 = g.toDomCoords(x2, y1_middle);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
+    
+    // Test edges of error bar areas(also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1_top);
+    xy2 = g.toDomCoords(x2, y1_top);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1_bottom);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
   }
 
   // Test second series (line)  
@@ -338,10 +354,16 @@ StepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() {
   var opts = {
     width: 480,
     height: 320,
-    drawXGrid: false,
-    drawYGrid: false,
-    drawXAxis: false,
-    drawYAxis: false,
+    axes : {
+      x : {
+        drawGrid: false,
+        drawAxis: false,
+      },
+      y : {
+        drawGrid: false,
+        drawAxis: false,
+      }
+    },
     customBars: true,
        labels: ["X", "Data1", "Data2"],
     series: {
@@ -380,34 +402,32 @@ StepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() {
     var y2_bottom = data[i + 1][1][0];
     
     // Bottom line
-    // Horizontal line
     var xy1 = g.toDomCoords(x1, y1_bottom);
     var xy2 = g.toDomCoords(x2, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     
     // Top line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_top);
     xy2 = g.toDomCoords(x2, y1_top);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
-    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
     
     // Middle line
-    // Horizontal line
     xy1 = g.toDomCoords(x1, y1_middle);
     xy2 = g.toDomCoords(x2, y1_middle);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
-    // Vertical line
-    xy1 = g.toDomCoords(x2, y1_middle);
-    xy2 = g.toDomCoords(x2, y2_middle);
+    
+    // Test edges of custom bar areas(also drawn by dygraphs as lines)
+    xy1 = g.toDomCoords(x1, y1_top);
+    xy2 = g.toDomCoords(x2, y1_top);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x2, y1_bottom);
+    CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    xy1 = xy2;
+    xy2 = g.toDomCoords(x1, y1_bottom);
     CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+    // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath.
+    // But a rectangle is completely tested with three of its four edges.
   }
   
   // Test second series (line)