X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fto_dom_coords.js;h=22ee3fef0b330377c4573b231a9c9b39e77fc80a;hb=464b5f504e75c5d2b98eff12b3b8ad520a1729cb;hp=5da5869dd40ae2d3cb859ca269f422df95c5cd84;hpb=1f8c95d80d5de7423de7536cea42753e03bbb450;p=dygraphs.git

diff --git a/auto_tests/tests/to_dom_coords.js b/auto_tests/tests/to_dom_coords.js
index 5da5869..22ee3fe 100644
--- a/auto_tests/tests/to_dom_coords.js
+++ b/auto_tests/tests/to_dom_coords.js
@@ -34,10 +34,16 @@ ToDomCoordsTestCase.prototype.checkForInverses = function(g) {
 
 ToDomCoordsTestCase.prototype.testPlainChart = function() {
   var opts = {
-    drawXAxis: false,
-    drawYAxis: false,
-    drawXGrid: false,
-    drawYGrid: false,
+    axes : {
+      x : {
+        drawAxis : false,
+        drawGrid : false,
+      },
+      y : {
+        drawAxis : false,
+        drawGrid : false,
+      }
+    },
     rightGap: 0,
     valueRange: [0, 100],
     dateWindow: [0, 100],
@@ -174,23 +180,26 @@ ToDomCoordsTestCase.prototype.testChartLogarithmic = function() {
     drawYGrid: false,
     logscale: true,
     rightGap: 0,
-    valueRange: [10, 100],
-    dateWindow: [10, 100],
+    valueRange: [1, 4],
+    dateWindow: [0, 10],
     width: 400,
     height: 400,
     colors: ['#ff0000']
   }
 
   var graph = document.getElementById("graph");
-  g = new Dygraph(graph, [ [10,10], [100,100] ], opts);
-
-  assertEquals([10, 100], g.toDataCoords(0, 0));
-  assertEquals([10, 10], g.toDataCoords(0, 400));
-  assertEquals([100, 100], g.toDataCoords(400, 0));
-  assertEquals([100, 10], g.toDataCoords(400, 400));
+  g = new Dygraph(graph, [ [1,1], [4,4] ], opts);
+
+  var epsilon = 1e-8;
+  assertEqualsDelta([0, 4], g.toDataCoords(0, 0), epsilon);
+  assertEqualsDelta([0, 1], g.toDataCoords(0, 400), epsilon);
+  assertEqualsDelta([10, 4], g.toDataCoords(400, 0), epsilon);
+  assertEqualsDelta([10, 1], g.toDataCoords(400, 400), epsilon);
+  assertEqualsDelta([10, 2], g.toDataCoords(400, 200), epsilon);
   
-  assertEquals([0, 0], g.toDomCoords(10, 100));
-  assertEquals([0, 400], g.toDomCoords(10, 10));
-  assertEquals([400, 0], g.toDomCoords(100, 100));
-  assertEquals([400, 400], g.toDomCoords(100, 10));
+  assertEquals([0, 0], g.toDomCoords(0, 4));
+  assertEquals([0, 400], g.toDomCoords(0, 1));
+  assertEquals([400, 0], g.toDomCoords(10, 4));
+  assertEquals([400, 400], g.toDomCoords(10, 1));
+  assertEquals([400, 200], g.toDomCoords(10, 2));
 }