X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Frange_tests.js;h=4fcb8223fd5c75929d21c4390cb8f7161c599f21;hb=36a27704957dda706074a857884d52c1cf5a974c;hp=32c511e6cef326f64ce0affca8c06fa21baf268f;hpb=d64b8fea31e652cdfa319cde3468eab748c81c49;p=dygraphs.git

diff --git a/auto_tests/tests/range_tests.js b/auto_tests/tests/range_tests.js
index 32c511e..4fcb822 100644
--- a/auto_tests/tests/range_tests.js
+++ b/auto_tests/tests/range_tests.js
@@ -35,6 +35,9 @@ var ZERO_TO_FIFTY_STEPS = function() {
   }
   return a;
 } ();
+var FIVE_TO_ONE_THOUSAND = [
+    [ 1, 10 ], [ 2, 20 ], [ 3, 30 ], [ 4, 40 ] , [ 5, 50 ], 
+    [ 6, 60 ], [ 7, 70 ], [ 8, 80 ], [ 9, 90 ] , [ 10, 1000 ]];
 
 var RangeTestCase = TestCase("range-tests");
 
@@ -70,8 +73,12 @@ RangeTestCase.prototype.testRangeSetOperations = function() {
   g.updateOptions({  });
   assertEquals([12, 18], g.xAxisRange());
   assertEquals([10, 40], g.yAxisRange(0));
+  
+  g.updateOptions({valueRange : null, axes: {y:{valueRange : [15, 20]}}});
+  assertEquals([12, 18], g.xAxisRange());
+  assertEquals([15, 20], g.yAxisRange(0));
 
-  g.updateOptions({ dateWindow : null, valueRange : null });
+  g.updateOptions({ dateWindow : null, valueRange : null, axes: null });
   assertEquals([10, 20], g.xAxisRange());
   assertEquals([0, 55], g.yAxisRange(0));
 };
@@ -132,3 +139,25 @@ RangeTestCase.prototype.testRestoreOriginalRanges_viaUpdateOptions = function()
   assertEquals([0, 55], g.yAxisRange(0));
   assertEquals([10, 20], g.xAxisRange());
 }
+
+/**
+ * Verify that log scale axis range is properly specified.
+ */
+RangeTestCase.prototype.testLogScaleExcludesZero = function() {
+  var g = new Dygraph("graph", FIVE_TO_ONE_THOUSAND, { logscale : true });
+  assertEquals([10, 1099], g.yAxisRange(0));
+ 
+  g.updateOptions({ logscale : false });
+  assertEquals([0, 1099], g.yAxisRange(0));
+}
+
+/**
+ * Verify that includeZero range is properly specified.
+ */
+RangeTestCase.prototype.testIncludeZeroIncludesZero = function() {
+  var g = new Dygraph("graph", [[0, 500], [500, 1000]], { includeZero : true });
+  assertEquals([0, 1100], g.yAxisRange(0));
+ 
+  g.updateOptions({ includeZero : false });
+  assertEquals([450, 1050], g.yAxisRange(0));
+}