- Changes from code review:

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

diff --git a/auto_tests/tests/multiple_axes.js b/auto_tests/tests/multiple_axes.js
index 3644e65..d08ff50 100644 (file)
--- a/auto_tests/tests/multiple_axes.js
+++ b/auto_tests/tests/multiple_axes.js
@@ -296,11 +296,14 @@ MultipleAxesTestCase.prototype.testDrawPointCallback = function() {
   var data = MultipleAxesTestCase.getData();
 
   var results = { y : {}, y2 : {}};
-  var firstCallback = function(g, seriesName) {
+  var firstCallback = function(g, seriesName, ctx, canvasx, canvasy, color, radius) {
     results.y[seriesName] = 1; 
+    Dygraph.Circles.DEFAULT(g, seriesName, ctx, canvasx, canvasy, color, radius);
+
   };
-  var secondCallback = function(g, seriesName) {
+  var secondCallback = function(g, seriesName, ctx, canvasx, canvasy, color, radius) {
     results.y2[seriesName] = 1; 
+    Dygraph.Circles.TRIANGLE(g, seriesName, ctx, canvasx, canvasy, color, radius);
   };
 
   g = new Dygraph(
@@ -309,6 +312,7 @@ MultipleAxesTestCase.prototype.testDrawPointCallback = function() {
     {
       labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ],
       drawPoints : true,
+      pointSize : 3,
       'Y3': {
         axis: {
         }
@@ -330,42 +334,3 @@ MultipleAxesTestCase.prototype.testDrawPointCallback = function() {
   assertEquals(1, results.y2["Y3"]);
   assertEquals(1, results.y2["Y4"]);
 };
-
-MultipleAxesTestCase.prototype.testDrawHighlightPointCallback = function() {
-  var data = MultipleAxesTestCase.getData();
-
-  var results = { y : {}, y2 : {}};
-  var firstCallback = function(g, seriesName) {
-    results.y[seriesName] = 1; 
-  };
-  var secondCallback = function(g, seriesName) {
-    results.y2[seriesName] = 1; 
-  };
-
-  g = new Dygraph(
-    document.getElementById("graph"),
-    data,
-    {
-      labels: [ 'Date', 'Y1', 'Y2', 'Y3', 'Y4' ],
-      drawPoints : true,
-      'Y3': {
-        axis: {
-        }
-      },
-      'Y4': {
-        axis: 'Y3'  // use the same y-axis as series Y3
-      },
-      axes: {
-        y2: {
-          drawHighlightPointCallback: secondCallback
-        }
-      },
-      drawHighlightPointCallback: firstCallback
-    }
-  );
-
-  assertEquals(1, results.y["Y1"]);
-  assertEquals(1, results.y["Y2"]);
-  assertEquals(1, results.y2["Y3"]);
-  assertEquals(1, results.y2["Y4"]);
-};