Merge pull request #548 from blcook223/range_sel_options

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

diff --git a/auto_tests/tests/custom_bars.js b/auto_tests/tests/custom_bars.js
index 493e86c..e8af214 100644 (file)
--- a/auto_tests/tests/custom_bars.js
+++ b/auto_tests/tests/custom_bars.js
@@ -6,16 +6,16 @@
  */
 var CustomBarsTestCase = TestCase("custom-bars");
 
-var _origFunc = Dygraph.getContext;
+CustomBarsTestCase._origFunc = Dygraph.getContext;
 CustomBarsTestCase.prototype.setUp = function() {
   document.body.innerHTML = "<div id='graph'></div>";
   Dygraph.getContext = function(canvas) {
-    return new Proxy(_origFunc(canvas));
+    return new Proxy(CustomBarsTestCase._origFunc(canvas));
   }
 };
 
 CustomBarsTestCase.prototype.tearDown = function() {
-  Dygraph.getContext = _origFunc;
+  Dygraph.getContext = CustomBarsTestCase._origFunc;
 };
 
 // This test used to reliably produce an infinite loop.
@@ -99,10 +99,16 @@ CustomBarsTestCase.prototype.testCustomBarsAtTop = function() {
         width: 500, height: 350,
         customBars: true,
         errorBars: true,
-        drawXGrid: false,
-        drawYGrid: false,
-        drawXAxis: false,
-        drawYAxis: false,
+        axes : {
+          x : {
+            drawGrid: false,
+            drawAxis: false,
+          },
+          y : {
+            drawGrid: false,
+            drawAxis: false,
+          }
+        },
         valueRange: [0, 120],
         fillAlpha: 0.15,
         colors: [ '#00FF00' ]
@@ -124,10 +130,16 @@ CustomBarsTestCase.prototype.testCustomBarsLogScale = function() {
         customBars: true,
         errorBars: true,
         valueRange: [1, 120],
-        drawXGrid: false,
-        drawYGrid: false,
-        drawXAxis: false,
-        drawYAxis: false,
+        axes : {
+          x : {
+            drawGrid: false,
+            drawAxis: false,
+          },
+          y : {
+            drawGrid: false,
+            drawAxis: false,
+          }
+        },
         fillAlpha: 1.0,
         logscale: true,
         colors: [ '#00FF00' ]
@@ -151,3 +163,33 @@ CustomBarsTestCase.prototype.testCustomBarsLogScale = function() {
        [247.5, 152.02209814465604]],
       { fillStyle: "#00ff00" });
 };
+
+CustomBarsTestCase.prototype.testCustomBarsWithNegativeValuesInLogScale =
+    function() {
+  var graph = document.getElementById("graph");
+
+  var count = 0;
+  var drawPointCallback = function() {
+    count++;
+  };
+
+  var g = new Dygraph(graph,
+      [
+        [1, [10, 20,30]],
+        [2, [5, 10, 15]],
+        [3, [-1, 5, 10]]
+      ],
+      {
+        drawPoints: true,
+        drawPointCallback : drawPointCallback,
+        customBars: true
+      });
+
+  // Normally all three points would be drawn.
+  assertEquals(3, count);
+  count = 0;
+
+  // In log scale, the third point shouldn't be shown.
+  g.updateOptions({ logscale : true });
+  assertEquals(2, count);
+};