X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fstacked.js;h=b8c095eb651b58111419c6b43074d5597280fa5b;hb=24f2a74f2b51cd3ecc187618ea9e061956cf9895;hp=d2ecb193529c994a284984a5a9d58761627ef7f9;hpb=2b43177b643943d2632500cb49bb7b8631e91eff;p=dygraphs.git

diff --git a/auto_tests/tests/stacked.js b/auto_tests/tests/stacked.js
index d2ecb19..b8c095e 100644
--- a/auto_tests/tests/stacked.js
+++ b/auto_tests/tests/stacked.js
@@ -5,11 +5,17 @@
  */
 var stackedTestCase = TestCase("stacked");
 
+stackedTestCase._origGetContext = Dygraph.getContext;
+
 stackedTestCase.prototype.setUp = function() {
   document.body.innerHTML = "<div id='graph'></div>";
+  Dygraph.getContext = function(canvas) {
+    return new Proxy(stackedTestCase._origGetContext(canvas));
+  }
 };
 
 stackedTestCase.prototype.tearDown = function() {
+  Dygraph.getContext = stackedTestCase._origGetContext;
 };
 
 stackedTestCase.prototype.testCorrectColors = function() {
@@ -41,8 +47,9 @@ stackedTestCase.prototype.testCorrectColors = function() {
   // y pixel 100 = y1 line (green)
   // y pixels 0-99 = nothing (white)
 
-  var canvas = g.hidden_ctx_;
-  var imageData = canvas.getImageData(0, 0, 400, 300);
+  // TODO(danvk): factor this and getPixel() into a utility usable by all tests.
+  var ctx = g.hidden_ctx_;
+  var imageData = ctx.getImageData(0, 0, 400, 300);
 
   assertEquals(400, imageData.width);
   assertEquals(300, imageData.height);
@@ -58,5 +65,217 @@ stackedTestCase.prototype.testCorrectColors = function() {
   // 38 = round(0.15 * 255)
   assertEquals([0, 0, 255, 38], getPixel(imageData, 200, 250));
   assertEquals([0, 255, 0, 38], getPixel(imageData, 200, 150));
-  assertEquals([255, 255, 255, 255], getPixel(imageData, 200, 50));
+};
+
+// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=358
+stackedTestCase.prototype.testSelectionValues = function() {
+  var opts = {
+    stackedGraph: true
+  };
+  var data = "X,Y1,Y2\n" +
+      "0,1,1\n" +
+      "1,1,1\n" +
+      "2,1,1\n" +
+      "3,1,1\n"
+  ;
+
+  var graph = document.getElementById("graph");
+  g = new Dygraph(graph, data, opts);
+
+  g.setSelection(0);
+
+  assertEquals("0: Y1: 1 Y2: 1", Util.getLegend());
+
+  // Verify that the behavior is correct with highlightSeriesOpts as well.
+  g.updateOptions({
+    highlightSeriesOpts: {
+      strokeWidth: 10
+    }
+  });
+  g.setSelection(0);
+  assertEquals("0: Y1: 1 Y2: 1", Util.getLegend());
+
+  g.setSelection(1);
+  assertEquals("1: Y1: 1 Y2: 1", Util.getLegend());
+
+  g.setSelection(0, 'Y2');
+  assertEquals("0: Y1: 1 Y2: 1", Util.getLegend());
+};
+
+// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=176
+stackedTestCase.prototype.testDuplicatedXValue = function() {
+  var opts = {
+    stackedGraph: true,
+    fillAlpha: 0.15,
+    colors: ['#00ff00'],
+    width: 400,
+    height: 300
+  };
+  var data = "X,Y1\n" +
+      "0,1\n" +
+      "1,1\n" +
+      "2,1\n" +
+      "2,1\n" +  // duplicate x-value!
+      "3,1\n"
+  ;
+
+  var graph = document.getElementById("graph");
+  g = new Dygraph(graph, data, opts);
+
+  assert(g.yAxisRange()[1] < 2);
+
+  assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 250));
+  assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 317, 250));
+}
+
+// Validates regression when null values in stacked graphs show up
+// incorrectly in the legend.
+stackedTestCase.prototype.testNullValues = function() {
+  var opts = {
+    stackedGraph: true,
+    stepPlot:true
+  };
+  var data = "X,Y1,Y2,Y3\n" +
+      "0,-5,-1,1\n" +
+      "1,1,,1\n" +
+      "2,1,2,3\n" +
+      "3,3,,4\n" +
+      "4,3,2,3\n"
+  ;
+
+  var graph = document.getElementById("graph");
+  g = new Dygraph(graph, data, opts);
+
+  g.setSelection(0);
+  assertEquals("0: Y1: -5 Y2: -1 Y3: 1", Util.getLegend());
+
+  g.setSelection(1);
+  assertEquals("1: Y1: 1 Y3: 1", Util.getLegend());
+
+  g.setSelection(2);
+  assertEquals("2: Y1: 1 Y2: 2 Y3: 3", Util.getLegend());
+
+  g.setSelection(3);
+  assertEquals("3: Y1: 3 Y3: 4", Util.getLegend());
+
+  g.setSelection(4);
+  assertEquals("4: Y1: 3 Y2: 2 Y3: 3", Util.getLegend());
+};
+
+// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=438
+stackedTestCase.prototype.testMissingValueAtZero = function() {
+  var opts = {
+    stackedGraph: true
+  };
+  var data = "X,Y1,Y2\n" +
+      "0,,1\n" +
+      "1,1,2\n" +
+      "2,,3\n"
+  ;
+
+  var graph = document.getElementById("graph");
+  g = new Dygraph(graph, data, opts);
+
+  g.setSelection(0);
+  assertEquals("0: Y2: 1", Util.getLegend());
+
+  g.setSelection(1);
+  assertEquals("1: Y1: 1 Y2: 2", Util.getLegend());
+
+  g.setSelection(2);
+  assertEquals("2: Y2: 3", Util.getLegend());
+};
+
+stackedTestCase.prototype.testInterpolation = function() {
+  var opts = {
+    colors: ['#ff0000', '#00ff00', '#0000ff'],
+    stackedGraph: true
+  };
+
+  // The last series is all-NaN, it ought to be treated as all zero
+  // for stacking purposes.
+  var N = NaN;
+  var data = [
+    [100, 1, 2, N, N],
+    [101, 1, 2, 2, N],
+    [102, 1, N, N, N],
+    [103, 1, 2, 4, N],
+    [104, N, N, N, N],
+    [105, 1, 2, N, N],
+    [106, 1, 2, 7, N],
+    [107, 1, 2, 8, N],
+    [108, 1, 2, 9, N],
+    [109, 1, N, N, N]];
+
+  var graph = document.getElementById("graph");
+  g = new Dygraph(graph, data, opts);
+
+  var htx = g.hidden_ctx_;
+  var attrs = {};
+
+  // Check that lines are drawn at the expected positions, using
+  // interpolated values for missing data.
+  CanvasAssertions.assertLineDrawn(
+      htx, g.toDomCoords(100, 4), g.toDomCoords(101, 4), {strokeStyle: '#00ff00'});
+  CanvasAssertions.assertLineDrawn(
+      htx, g.toDomCoords(102, 6), g.toDomCoords(103, 7), {strokeStyle: '#ff0000'});
+  CanvasAssertions.assertLineDrawn(
+      htx, g.toDomCoords(107, 8), g.toDomCoords(108, 9), {strokeStyle: '#0000ff'});
+  CanvasAssertions.assertLineDrawn(
+      htx, g.toDomCoords(108, 12), g.toDomCoords(109, 12), {strokeStyle: '#ff0000'});
+
+  // Check that the expected number of line segments gets drawn
+  // for each series. Gaps don't get a line.
+  assertEquals(7, CanvasAssertions.numLinesDrawn(htx, '#ff0000'));
+  assertEquals(4, CanvasAssertions.numLinesDrawn(htx, '#00ff00'));
+  assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#0000ff'));
+
+  // Check that the selection returns the original (non-stacked)
+  // values and skips gaps.
+  g.setSelection(1);
+  assertEquals("101: Y1: 1 Y2: 2 Y3: 2", Util.getLegend());
+
+  g.setSelection(8);
+  assertEquals("108: Y1: 1 Y2: 2 Y3: 9", Util.getLegend());
+
+  g.setSelection(9);
+  assertEquals("109: Y1: 1", Util.getLegend());
+};
+
+stackedTestCase.prototype.testInterpolationOptions = function() {
+  var opts = {
+    colors: ['#ff0000', '#00ff00', '#0000ff'],
+    stackedGraph: true
+  };
+
+  var data = [
+    [100, 1, NaN, 3],
+    [101, 1, 2, 3],
+    [102, 1, NaN, 3],
+    [103, 1, 2, 3],
+    [104, 1, NaN, 3]];
+
+  var choices = ['all', 'inside', 'none'];
+  var stackedY = [
+    [6, 6, 6, 6, 6],
+    [4, 6, 6, 6, 4],
+    [4, 6, 4, 6, 4]];
+
+  for (var i = 0; i < choices.length; ++i) {
+    var graph = document.getElementById("graph");
+    opts['stackedGraphNaNFill'] = choices[i];
+    g = new Dygraph(graph, data, opts);
+
+    var htx = g.hidden_ctx_;
+    var attrs = {};
+
+    // Check top lines get drawn at the expected positions.
+    for (var j = 0; j < stackedY[i].length - 1; ++j) {
+      CanvasAssertions.assertLineDrawn(
+          htx,
+          g.toDomCoords(100 + j, stackedY[i][j]),
+          g.toDomCoords(101 + j, stackedY[i][j + 1]),
+          {strokeStyle: '#ff0000'});
+    }
+  }
 };