From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Mon, 15 Apr 2013 11:26:00 +0000 (+0200)
Subject: FEATURE: extended test for the bugfix for issue #451
X-Git-Tag: v1.0.0~31^2~6
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=eb55da0f9949ba30ffd97ae8ad18ad4a9b6b3f4e;p=dygraphs.git

FEATURE: extended test for the bugfix for issue #451
---

diff --git a/auto_tests/tests/connect_separated_points.js b/auto_tests/tests/connect_separated_points.js
index 0f40d90..e13af5a 100644
--- a/auto_tests/tests/connect_separated_points.js
+++ b/auto_tests/tests/connect_separated_points.js
@@ -26,34 +26,22 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsSimple = function() {
   var opts = {
     width: 480,
     height: 320,
-//    drawXGrid: false,
-//    drawYGrid: false,
-//    drawXAxis: false,
-//    drawYAxis: false,
-//    errorBars: false,
-    labels: ["x", "series1", "series2", "series3"],
+    labels: ["x", "series1", "series2", "additionalSeries"],
     connectSeparatedPoints: true,
-    drawPoints: true,
-    dateWindow: [1.5,6.5]
+    dateWindow: [2.5,7.5]
   };
 
   var data = [
-              [-7,-1000,0,null],
-              [-6,null,2,null],
-              [-5,null,2,null],
-              [-4,null,2,null],
-              [-3,null,2,null],
-              [-2,null,2,null],
-              [-1,null,2,null],
-              [0,null,2,null],
-              [1,null,4,null],
-              [2,0.5,0,null],
-              [3,1,-1,5],
-              [4,2,-2,6],
-              [5,2.5,-2.5,7],
-              [6,3,-3,4],
-              [7,4,null,5],
-              [8,4,-10,6],
+              [0,-1,0,null],
+              [1,null,2,null],
+              [2,null,4,null],
+              [3,0.5,0,null],
+              [4,1,-1,5],
+              [5,2,-2,6],
+              [6,2.5,-2.5,7],
+              [7,3,-3,null],
+              [8,4,null,null],
+              [9,4,-10,null],
              ];
 
   var graph = document.getElementById("graph");
@@ -63,77 +51,63 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsSimple = function() {
 
   var attrs = {};  
 
-  //Test if series1 is drawn correctly.
-  //------------------------------------
+  // Test if series1 is drawn correctly.
+  // ------------------------------------
   
   // The first point of the first series
   var x1 = data[0][0];
   var y1 = data[0][1];
   var xy1 = g.toDomCoords(x1, y1);
   
-  // The third (the second valid) point of the first series
-  // This series has no value at the second position.
-  var x2 = data[9][0];
-  var y2 = data[9][1];
+  // The next valid point of this series
+  var x2 = data[3][0];
+  var y2 = data[3][1];
   var xy2 = g.toDomCoords(x2, y2);
   
   // Check if both points are connected at the left edge of the canvas and if the option "connectSeparatedPoints" works properly
   // even if the point is outside the visible range and only one series has a valid value for this point.
   CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
 
-  //Test if series2 is drawn correctly.
-  //------------------------------------
-  
-  // The sixth point of the second series
-  // Use the sixth and NOT the seventh point despite this series has eight points 
-  // since this series has no value at the seventh position.
-  var x1 = data[13][0];
-  var y1 = data[13][2];
-  var xy1 = g.toDomCoords(x1, y1);
-  
+  // Test if series2 is drawn correctly.
+  // ------------------------------------
+
   // The last point of the second series.
-  var x2 = data[15][0];
-  var y2 = data[15][2];
+  var x2 = data[9][0];
+  var y2 = data[9][2];
   var xy2 = g.toDomCoords(x2, y2);
+
+  // The previous valid point of this series
+  var x1 = data[7][0];
+  var y1 = data[7][2];
+  var xy1 = g.toDomCoords(x1, y1);
   
   // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly
   // even if the point is outside the visible range and only one series has a valid value for this point.
   CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
 };
 
-ConnectSeparatedPointsTestCase.prototype.testEdgePointsStacked = function() {
+ConnectSeparatedPointsTestCase.prototype.testEdgePointsCustomBars = function() {
   var opts = {
     width: 480,
     height: 320,
-//    drawXGrid: false,
-//    drawYGrid: false,
-//    drawXAxis: false,
-//    drawYAxis: false,
-//    errorBars: false,
-    labels: ["x", "series1", "series2", "series3"],
+    labels: ["x", "series1", "series2", "additionalSeries"],
     connectSeparatedPoints: true,
-    drawPoints: true,
-    stackedGraph: true,
-    dateWindow: [1.5,6.5]
+    dateWindow: [2.5,7.5],
+    customBars: true
   };
-
+  
   var data = [
-              [-7,null,1,0],
-              [-6,null,3,null],
-              [-5,null,3,null],
-              [-4,null,3,null],
-              [-3,null,3,null],
-              [-2,null,3,null],
-              [-1,null,3,null],
-              [0,null,3,null],
-              [1,null,3,null],
-              [2,null,1,3],
-              [3,3,1,1],
-              [4,4,2,2],
-              [5,3,2,2],
-              [6,3,1,3],
-              [7,4,null,2],
-              [8,5,2,1],
+              [0,[4,5,6], [1,2,3], [null, null, null]],
+              [1,[null,null,null], [2,3,4], [null, null, null]],
+              [2,[null,null,null], [3,4,5], [null, null, null]],
+              [3,[0,1,2], [2,3,4], [null, null, null]],    
+              [4,[1,2,3], [2,3,4], [4, 5, 6]],
+              [5,[1,2,3], [3,4,5], [4, 5, 6]],
+              [6,[0,1,2], [4,5,6], [5, 6, 7]],
+              [7,[0,1,2], [4,5,6], [null, null, null]],
+              [8,[2,3,4], [null,null,null], [null, null, null]],
+              [9,[0,1,2], [2,4,9], [null, null, null]]
+              
              ];
 
   var graph = document.getElementById("graph");
@@ -143,39 +117,236 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsStacked = function() {
 
   var attrs = {};  
 
-  //Test if series1 is drawn correctly.
-  //------------------------------------
+  
+  // Test if values of the series1 are drawn correctly.
+  // ------------------------------------
   
   // The first point of the first series
   var x1 = data[0][0];
-  var y1 = data[0][1];
+  var y1 = data[0][1][1];
   var xy1 = g.toDomCoords(x1, y1);
   
-  // The third (the second valid) point of the first series
-  // This series has no value at the second position.
-  var x2 = data[9][0];
-  var y2 = data[9][1];
+  // The next valid point of this series
+  var x2 = data[3][0];
+  var y2 = data[3][1][1];
   var xy2 = g.toDomCoords(x2, y2);
   
   // Check if both points are connected at the left edge of the canvas and if the option "connectSeparatedPoints" works properly
   // even if the point is outside the visible range and only one series has a valid value for this point.
   CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // Test if the custom bars of the series1 are drawn correctly
+  // --------------------------------------------
+  
+  // The first min-point of this series
+  x1 = data[0][0];
+  y1 = data[0][1][0];
+  xy1 = g.toDomCoords(x1, y1);
 
-  //Test if series2 is drawn correctly.
-  //------------------------------------
+  // The next valid min-point of the second series.
+  x2 = data[3][0];
+  y2 = data[3][1][0];
+  xy2 = g.toDomCoords(x2, y2);
   
-  // The sixth point of the second series
-  // Use the sixth and NOT the seventh point despite this series has eight points 
-  // since this series has no value at the seventh position.
-  var x1 = data[13][0];
-  var y1 = data[13][2];
-  var xy1 = g.toDomCoords(x1, y1);
+  // Check if both points are connected at the left edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // The first max-point of this series
+  x1 = data[0][0];
+  y1 = data[0][1][2];
+  xy1 = g.toDomCoords(x1, y1);
+  
+  // The next valid max-point of the second series.
+  x2 = data[3][0];
+  y2 = data[3][1][2];
+  xy2 = g.toDomCoords(x2, y2);
+  
+  // Check if both points are connected at the left edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // Test if values of the series2 are drawn correctly.
+  // ------------------------------------
   
   // The last point of the second series.
-  var x2 = data[15][0];
-  var y2 = data[15][2];
+  var x2 = data[9][0];
+  var y2 = data[9][2][1];
   var xy2 = g.toDomCoords(x2, y2);
   
+  // The previous valid point of this series
+  var x1 = data[7][0];
+  var y1 = data[7][2][1];
+  var xy1 = g.toDomCoords(x1, y1);
+  
+  // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // Test if the custom bars of the series2 are drawn correctly
+  // --------------------------------------------
+  
+  // The last min-point of the second series.
+  x2 = data[9][0];
+  y2 = data[9][2][0];
+  xy2 = g.toDomCoords(x2, y2);
+  
+  // The previous valid min-point of this series
+  x1 = data[7][0];
+  y1 = data[7][2][0];
+  xy1 = g.toDomCoords(x1, y1);
+  
+  // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // The last max-point of the second series.
+  x2 = data[9][0];
+  y2 = data[9][2][2];
+  xy2 = g.toDomCoords(x2, y2);
+  
+  // The previous valid max-point of this series
+  x1 = data[7][0];
+  y1 = data[7][2][2];
+  xy1 = g.toDomCoords(x1, y1);
+  
+  // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+};
+
+ConnectSeparatedPointsTestCase.prototype.testEdgePointsErrorBars = function() {
+  var opts = {
+    width: 480,
+    height: 320,
+    labels: ["x", "series1", "series2", "seriesTestHelper"],
+    connectSeparatedPoints: true,
+    dateWindow: [2,7.5],
+    errorBars: true
+    
+  };
+  
+  var data = [
+              [0,[5,1], [2,1], [null,null]],
+              [1,[null,null], [3,1], [null,null]],
+              [2,[null,null], [4,1], [null,null]],
+              [3,[1,1], [3,1], [null,null]],    
+              [4,[2,1], [3,1], [5,1]],
+              [5,[2,1], [4,1], [5,1]],
+              [6,[1,1], [5,1], [6,1]],
+              [7,[1,1], [5,1], [null,null]],
+              [8,[3,1], [null,null], [null,null]],
+              [9,[1,1], [4,1], [null,null]]
+              
+             ];
+
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, data, opts);
+  
+  htx = g.hidden_ctx_;
+
+  var attrs = {};  
+
+  
+  // Test if values of the series1 are drawn correctly.
+  // ------------------------------------
+  
+  // The first point of the first series
+  var x1 = data[0][0];
+  var y1 = data[0][1][0];
+  var xy1 = g.toDomCoords(x1, y1);
+  
+  // The next valid point of this series
+  var x2 = data[3][0];
+  var y2 = data[3][1][0];
+  var xy2 = g.toDomCoords(x2, y2);
+  
+  // Check if both points are connected at the left edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // Test if the upper error bars of series1 are drawn correctly
+  // --------------------------------------------
+  
+  // The first upper error-point of this series
+  x1 = data[0][0];
+  var y1error = y1 + (data[0][1][1]*2);
+  xy1 = g.toDomCoords(x1, y1error);
+  
+  // The next valid upper error-point of the second series.
+  x2 = data[3][0];
+  var y2error = y2 + (data[3][1][1]*2);
+  xy2 = g.toDomCoords(x2, y2error);
+  
+  // Check if both points are connected at the left edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // Test if the lower error bars of series1 are drawn correctly
+  // --------------------------------------------
+  
+  // The first lower error-point of this series
+  x1 = data[0][0];
+  y1error = y1 - (data[0][1][1]*2);
+  xy1 = g.toDomCoords(x1, y1error);
+  
+  //The next valid lower error-point of the second series.
+  x2 = data[3][0];
+  y2error = y2 - (data[3][1][1]*2);
+  xy2 = g.toDomCoords(x2, y2error);
+  
+  // Check if both points are connected at the left edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  
+  // Test if values of the series2 are drawn correctly.
+  // ------------------------------------
+  
+  // The last point of this series
+  x2 = data[9][0];
+  y2 = data[9][2][0];
+  xy2 = g.toDomCoords(x2, y2);
+  
+  // The previous valid point of the first series
+  x1 = data[7][0];
+  y1 = data[7][2][0];
+  xy1 = g.toDomCoords(x1, y1);
+  
+  // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // Test if the upper error bars of series2 are drawn correctly
+  // --------------------------------------------
+  
+  // The last upper error-point of the second series.
+  x2 = data[9][0];
+  var y2error = y2 + (data[9][2][1]*2);
+  xy2 = g.toDomCoords(x2, y2error);
+  
+  // The previous valid upper error-point of this series
+  x1 = data[7][0];
+  var y1error = y1 + (data[7][2][1]*2);
+  xy1 = g.toDomCoords(x1, y1error);
+  
+  // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly
+  // even if the point is outside the visible range and only one series has a valid value for this point.
+  CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);
+  
+  // Test if the lower error bars of series1 are drawn correctly
+  // --------------------------------------------
+  
+  // The last lower error-point of the second series.
+  x2 = data[9][0];
+  y2error = y2 - (data[9][2][1]*2);
+  xy2 = g.toDomCoords(x2, y2error);
+  
+  // The previous valid lower error-point of this series
+  x1 = data[7][0];
+  y1error = y1 - (data[7][2][1]*2);
+  xy1 = g.toDomCoords(x1, y1error);
+  
   // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly
   // even if the point is outside the visible range and only one series has a valid value for this point.
   CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs);