X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fsimple_drawing.js;h=dde41b8647752c234bf759a540080729d6ec890d;hb=87c5a64c0521a645972b52e3a767d14548a06bc3;hp=71f2fc1609b7c026b9e8728a8e8cc76d703bb16e;hpb=01ebcbd470fbe8a6652195927c6585d4c854575b;p=dygraphs.git

diff --git a/auto_tests/tests/simple_drawing.js b/auto_tests/tests/simple_drawing.js
index 71f2fc1..dde41b8 100644
--- a/auto_tests/tests/simple_drawing.js
+++ b/auto_tests/tests/simple_drawing.js
@@ -27,16 +27,16 @@ var ZERO_TO_FIFTY = [[ 10, 0 ] , [ 20, 50 ]];
 
 var SimpleDrawingTestCase = TestCase("simple-drawing");
 
-var _origFunc = Dygraph.getContext;
+SimpleDrawingTestCase._origFunc = Dygraph.getContext;
 SimpleDrawingTestCase.prototype.setUp = function() {
   document.body.innerHTML = "<div id='graph'></div>";
-  // Dygraph.getContext = function(canvas) {
-  //   return new Proxy(_origFunc(canvas));
-  // }
+  Dygraph.getContext = function(canvas) {
+    return new Proxy(SimpleDrawingTestCase._origFunc(canvas));
+  }
 };
 
 SimpleDrawingTestCase.prototype.tearDown = function() {
-  Dygraph.getContext = _origFunc;
+  Dygraph.getContext = SimpleDrawingTestCase._origFunc;
 };
 
 SimpleDrawingTestCase.prototype.testDrawSimpleRangePlusOne = function() {
@@ -49,10 +49,115 @@ SimpleDrawingTestCase.prototype.testDrawSimpleRangePlusOne = function() {
 
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, ZERO_TO_FIFTY, opts);
-  // var htx = g.hidden_ctx_;
+  var htx = g.hidden_ctx_;
 
-  // CanvasAssertions.assertLineDrawn(htx, [56,300], [475,5.8], {
-  //   strokeStyle: "#008080",
-  //   lineWidth: 1
-  // });
-}
+  CanvasAssertions.assertLineDrawn(htx, [0,320], [475,6.2745], {
+    strokeStyle: "#008080",
+    lineWidth: 1
+  });
+  g.destroy(); // to balance context saves and destroys.
+  CanvasAssertions.assertBalancedSaveRestore(htx);
+};
+
+// See http://code.google.com/p/dygraphs/issues/detail?id=185
+SimpleDrawingTestCase.prototype.testDrawSimpleRangeZeroToFifty = function() {
+  var opts = {
+    drawXGrid: false,
+    drawYGrid: false,
+    drawXAxis: false,
+    drawYAxis: false,
+    valueRange: [0,50] }
+
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, ZERO_TO_FIFTY, opts);
+  var htx = g.hidden_ctx_;
+
+  var lines = CanvasAssertions.getLinesDrawn(htx, {
+    strokeStyle: "#008080",
+    lineWidth: 1
+  });
+  assertEquals(1, lines.length);
+  g.destroy(); // to balance context saves and destroys.
+  CanvasAssertions.assertBalancedSaveRestore(htx);
+};
+
+SimpleDrawingTestCase.prototype.testDrawWithAxis = function() {
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, ZERO_TO_FIFTY);
+
+  var htx = g.hidden_ctx_;
+  g.destroy(); // to balance context saves and destroys.
+  CanvasAssertions.assertBalancedSaveRestore(htx);
+};
+
+/**
+ * Tests that it is drawing dashes, and it remember the dash history between
+ * points.
+ */
+SimpleDrawingTestCase.prototype.testDrawSimpleDash = function() {
+  var opts = {
+    axes: {
+      x: {
+        drawGrid: false,
+        drawAxis: false
+      },
+      y: {
+        drawGrid: false,
+        drawAxis: false
+      }
+    },
+    series: {
+      'Y1': {strokePattern: [25, 7, 7, 7]},
+    },
+    colors: ['#ff0000']
+  };
+
+  var graph = document.getElementById("graph");
+  // Set the dims so we pass if default changes.
+  graph.style.width='480px';
+  graph.style.height='320px';
+  var g = new Dygraph(graph, [[1, 4], [2, 5], [3, 3], [4, 7], [5, 9]], opts);
+  htx = g.hidden_ctx_;
+
+  // TODO(danvk): figure out a good way to restore this test.
+  // assertEquals(29, CanvasAssertions.numLinesDrawn(htx, "#ff0000"));
+  g.destroy(); // to balance context saves and destroys.
+  CanvasAssertions.assertBalancedSaveRestore(htx);
+};
+
+/**
+ * Tests that thick lines are drawn continuously.
+ * Regression test for http://code.google.com/p/dygraphs/issues/detail?id=328
+ */
+SimpleDrawingTestCase.prototype.testDrawThickLine = function() {
+  var opts = {
+    drawXGrid: false,
+    drawYGrid: false,
+    drawXAxis: false,
+    drawYAxis: false,
+    strokeWidth: 15,
+    colors: ['#ff0000']
+  };
+
+  var graph = document.getElementById("graph");
+  // Set the dims so we pass if default changes.
+  graph.style.width='480px';
+  graph.style.height='320px';
+  var g = new Dygraph(graph, [[1, 2], [2, 5], [3, 2], [4, 7], [5, 0]], opts);
+  htx = g.hidden_ctx_;
+
+  // There's a big gap in the line at (2, 5)
+  // If the bug is fixed, then there should be some red going up from here.
+  var xy = g.toDomCoords(2, 5);
+  var x = Math.round(xy[0]), y = Math.round(xy[1]);
+
+  var sampler = new PixelSampler(g);
+  assertEquals([255,0,0,255], sampler.colorAtPixel(x, y));
+  assertEquals([255,0,0,255], sampler.colorAtPixel(x, y - 1));
+  assertEquals([255,0,0,255], sampler.colorAtPixel(x, y - 2));
+
+  // TODO(danvk): figure out a good way to restore this test.
+  // assertEquals(29, CanvasAssertions.numLinesDrawn(htx, "#ff0000"));
+  g.destroy(); // to balance context saves and destroys.
+  CanvasAssertions.assertBalancedSaveRestore(htx);
+};