Merge branch 'master' of github.com:danvk/dygraphs

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

diff --git a/auto_tests/tests/callback.js b/auto_tests/tests/callback.js
index 9db628a..af524a0 100644 (file)
--- a/auto_tests/tests/callback.js
+++ b/auto_tests/tests/callback.js
@@ -420,17 +420,23 @@ CallbackTestCase.prototype.testNaNDataStack = function() {
   assertEquals(1, res.row);
   assertEquals('c', res.seriesName);
 
-  // First gap, no data due to NaN contagion.
+  // All-NaN area at left, should get no points.
+  dom = g.toDomCoords(9.1, 0.9);
+  res = g.findStackedPoint(dom[0], dom[1]);
+  assertEquals(0, res.row);
+  assertEquals(undefined, res.seriesName);
+
+  // First gap, get 'c' since it's non-NaN.
   dom = g.toDomCoords(12.1, 0.9);
   res = g.findStackedPoint(dom[0], dom[1]);
   assertEquals(3, res.row);
-  assertEquals(undefined, res.seriesName);
+  assertEquals('c', res.seriesName);
 
-  // Second gap, no data due to NaN contagion.
+  // Second gap, get 'b' since 'c' is NaN.
   dom = g.toDomCoords(15.1, 0.9);
   res = g.findStackedPoint(dom[0], dom[1]);
   assertEquals(6, res.row);
-  assertEquals(undefined, res.seriesName);
+  assertEquals('b', res.seriesName);
 
   // Isolated points should work, finding series b in this case.
   dom = g.toDomCoords(15.9, 3.1);
@@ -638,8 +644,7 @@ CallbackTestCase.prototype.testDrawPointCallback_idx = function() {
     // Test that correct idx for isolated points are passed to the callback.
     g = new Dygraph(graph, testdata, graphOpts);
     assertEquals(2, indices.length);
-    assertEquals(3, indices[0]);
-    assertEquals(5, indices[1]);
+    assertEquals([3, 5],indices);
 
     // Test that correct indices for isolated points + gap points are passed to the callback when
     // drawGapEdgePoints is set.  This should add one point at the right
@@ -648,9 +653,7 @@ CallbackTestCase.prototype.testDrawPointCallback_idx = function() {
     graphOpts.drawGapEdgePoints = true;
     g = new Dygraph(graph, testdata, graphOpts);
     assertEquals(3, indices.length);
-    assertEquals(1, indices[0]);
-    assertEquals(3, indices[1]);
-    assertEquals(5, indices[2]);
+    assertEquals([1, 3, 5],indices);
 
 
     //Test that correct indices are passed to the callback when zoomed in.
@@ -660,15 +663,12 @@ CallbackTestCase.prototype.testDrawPointCallback_idx = function() {
     testdata = [[10, 2], [11, 3], [12, 4], [13, 2], [14, 5], [15, 3]];
     g = new Dygraph(graph, testdata, graphOpts);
     assertEquals(3, indices.length);
-    assertEquals(2, indices[0]);
-    assertEquals(3, indices[1]);
-    assertEquals(4, indices[2]);
+    assertEquals([2, 3, 4],indices);
 };
 
 /**
  * Test that the correct idx is returned for the point in the onHiglightCallback.
- *
- */
+  */
 CallbackTestCase.prototype.testDrawHighlightPointCallback_idx = function() {
     var idxToCheck = null;