X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=auto_tests%2Ftests%2Fcallback.js;h=0e6b4fa78b63d2e9d54af3fb74b0008d3d86b60e;hb=d61e06a4eb7282c37589daf3a24090534aff8430;hp=a7266d1891d803266382e7f458e620c0dd133e23;hpb=72c12eda172cf9f25ad4158f1962392d8c64da9e;p=dygraphs.git diff --git a/auto_tests/tests/callback.js b/auto_tests/tests/callback.js index a7266d1..0e6b4fa 100644 --- a/auto_tests/tests/callback.js +++ b/auto_tests/tests/callback.js @@ -1,4 +1,4 @@ -/** +/** * @fileoverview Test cases for the callbacks. * * @author uemit.seren@gmail.com (Ãmit Seren) @@ -7,40 +7,43 @@ var CallbackTestCase = TestCase("callback"); CallbackTestCase.prototype.setUp = function() { - document.body.innerHTML = "
"; + document.body.innerHTML = ""; + this.styleSheet = document.createElement("style"); + this.styleSheet.type = "text/css"; + document.getElementsByTagName("head")[0].appendChild(this.styleSheet); }; CallbackTestCase.prototype.tearDown = function() { }; - + var data = "X,a\,b,c\n" + - "10,-1,1,2\n" + - "11,0,3,1\n" + - "12,1,4,2\n" + - "13,0,2,3\n"; - - + "10,-1,1,2\n" + + "11,0,3,1\n" + + "12,1,4,2\n" + + "13,0,2,3\n"; + + /** * This tests that when the function idxToRow_ returns the proper row and the onHiglightCallback - * is properly called when the first series is hidden (setVisibility = false) - * + * is properly called when the first series is hidden (setVisibility = false) + * */ CallbackTestCase.prototype.testHighlightCallbackIsCalled = function() { var h_row; var h_pts; - var highlightCallback = function(e, x, pts, row) { + var highlightCallback = function(e, x, pts, row) { h_row = row; h_pts = pts; - }; + }; var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { width: 100, - height : 100, + height: 100, visibility: [false, true, true], - highlightCallback : highlightCallback, + highlightCallback: highlightCallback }); DygraphOps.dispatchMouseMove(g, 13, 10); @@ -60,7 +63,7 @@ CallbackTestCase.prototype.testDrawPointCallback_disabled = function() { var callback = function() { called = true; - }; + }; var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { @@ -78,7 +81,7 @@ CallbackTestCase.prototype.testDrawPointCallback_enabled = function() { var callback = function() { called = true; - }; + }; var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { @@ -99,7 +102,7 @@ CallbackTestCase.prototype.testDrawPointCallback_pointSize = function() { var callback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam) { pointSize = pointSizeParam; count++; - }; + }; var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { @@ -120,26 +123,367 @@ CallbackTestCase.prototype.testDrawPointCallback_pointSize = function() { }; /** + * Test that drawPointCallback is called for isolated points when + * drawPoints is false, and also for gap points if that's enabled. + */ +CallbackTestCase.prototype.testDrawPointCallback_isolated = function() { + var xvalues = []; + + var g; + var callback = function(g, seriesName, canvasContext, cx, cy, color, pointSizeParam) { + var dx = g.toDataXCoord(cx); + xvalues.push(dx); + Dygraph.Circles.DEFAULT.apply(this, arguments); + }; + + var graph = document.getElementById("graph"); + var testdata = [[10, 2], [11, 3], [12, NaN], [13, 2], [14, NaN], [15, 3]]; + var graphOpts = { + labels: ['X', 'Y'], + valueRange: [0, 4], + drawPoints : false, + drawPointCallback : callback, + pointSize : 8 + }; + + // Test that isolated points get drawn + g = new Dygraph(graph, testdata, graphOpts); + assertEquals(2, xvalues.length); + assertEquals(13, xvalues[0]); + assertEquals(15, xvalues[1]); + + // Test that isolated points + gap points get drawn when + // drawGapEdgePoints is set. This should add one point at the right + // edge of the segment at x=11, but not at the graph edge at x=10. + xvalues = []; // Reset for new test + graphOpts.drawGapEdgePoints = true; + g = new Dygraph(graph, testdata, graphOpts); + assertEquals(3, xvalues.length); + assertEquals(11, xvalues[0]); + assertEquals(13, xvalues[1]); + assertEquals(15, xvalues[2]); +}; + +/** * This tests that when the function idxToRow_ returns the proper row and the onHiglightCallback - * is properly called when the first series is hidden (setVisibility = false) - * + * is properly called when the first series is hidden (setVisibility = false) + * */ -CallbackTestCase.prototype.testDrawHighlightCallbackIsCalled = function() { +CallbackTestCase.prototype.testDrawHighlightPointCallbackIsCalled = function() { var called = false; - var drawHighlightCallback = function() { + var drawHighlightPointCallback = function() { called = true; - }; + }; var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, { width: 100, height : 100, - drawHighlightCallback : drawHighlightCallback + drawHighlightPointCallback : drawHighlightPointCallback }); assertFalse(called); DygraphOps.dispatchMouseMove(g, 13, 10); assertTrue(called); }; + +/** + * Test the closest-series highlighting methods for normal and stacked modes. + * Also pass in line widths for plain and highlighted lines for easier visual + * confirmation that the highlighted line is drawn on top of the others. + */ +var runClosestTest = function(isStacked, widthNormal, widthHighlighted) { + var h_row; + var h_pts; + var h_series; + + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, data, + { + width: 600, + height: 400, + visibility: [false, true, true], + stackedGraph: isStacked, + strokeWidth: widthNormal, + strokeBorderWidth: 2, + highlightCircleSize: widthNormal * 2, + highlightSeriesBackgroundAlpha: 0.3, + + highlightSeriesOpts: { + strokeWidth: widthHighlighted, + highlightCircleSize: widthHighlighted * 2 + } + }); + + var highlightCallback = function(e, x, pts, row, set) { + h_row = row; + h_pts = pts; + h_series = set; + document.getElementById('selection').innerHTML='row=' + row + ', set=' + set; + }; + + g.updateOptions({highlightCallback: highlightCallback}, true); + + if (isStacked) { + DygraphOps.dispatchMouseMove(g, 11.45, 1.4); + assertEquals(1, h_row); + assertEquals('c', h_series); + + //now move up in the same row + DygraphOps.dispatchMouseMove(g, 11.45, 1.5); + assertEquals(1, h_row); + assertEquals('b', h_series); + + //and a bit to the right + DygraphOps.dispatchMouseMove(g, 11.55, 1.5); + assertEquals(2, h_row); + assertEquals('c', h_series); + } else { + DygraphOps.dispatchMouseMove(g, 11, 1.5); + assertEquals(1, h_row); + assertEquals('c', h_series); + + //now move up in the same row + DygraphOps.dispatchMouseMove(g, 11, 2.5); + assertEquals(1, h_row); + assertEquals('b', h_series); + } + + return g; +}; + +/** + * Test basic closest-point highlighting. + */ +CallbackTestCase.prototype.testClosestPointCallback = function() { + runClosestTest(false, 1, 3); +} + +/** + * Test setSelection() with series name + */ +CallbackTestCase.prototype.testSetSelection = function() { + var g = runClosestTest(false, 1, 3); + assertEquals(1, g.attr_('strokeWidth', 'c')); + g.setSelection(false, 'c'); + assertEquals(3, g.attr_('strokeWidth', 'c')); +} + +/** + * Test closest-point highlighting for stacked graph + */ +CallbackTestCase.prototype.testClosestPointStackedCallback = function() { + runClosestTest(true, 1, 3); +} + +/** + * Closest-point highlighting with legend CSS - border around active series. + */ +CallbackTestCase.prototype.testClosestPointCallbackCss1 = function() { + var css = "div.dygraph-legend > span { display: block; }\n" + + "div.dygraph-legend > span.highlight { border: 1px solid grey; }\n"; + this.styleSheet.innerHTML = css; + runClosestTest(false, 2, 4); + this.styleSheet.innerHTML = ''; +} + +/** + * Closest-point highlighting with legend CSS - show only closest series. + */ +CallbackTestCase.prototype.testClosestPointCallbackCss2 = function() { + var css = "div.dygraph-legend > span { display: none; }\n" + + "div.dygraph-legend > span.highlight { display: inline; }\n"; + this.styleSheet.innerHTML = css; + runClosestTest(false, 10, 15); + this.styleSheet.innerHTML = ''; + // TODO(klausw): verify that the highlighted line is drawn on top? +} + +/** + * Closest-point highlighting with locked series. + */ +CallbackTestCase.prototype.testSetSelectionLocking = function() { + var g = runClosestTest(false, 2, 4); + + // Default behavior, 'b' is closest + DygraphOps.dispatchMouseMove(g, 11, 4); + assertEquals('b', g.getHighlightSeries()); + + // Now lock selection to 'c' + g.setSelection(false, 'c', true); + DygraphOps.dispatchMouseMove(g, 11, 4); + assertEquals('c', g.getHighlightSeries()); + + // Unlock, should be back to 'b' + g.clearSelection(); + DygraphOps.dispatchMouseMove(g, 11, 4); + assertEquals('b', g.getHighlightSeries()); +} + +/** + * This tests that closest point searches work for data containing NaNs. + * + * It's intended to catch a regression where a NaN Y value confuses the + * closest-point algorithm, treating it as closer as any previous point. + */ +CallbackTestCase.prototype.testNaNData = function() { + var dataNaN = [ + [9, -1, NaN, NaN], + [10, -1, 1, 2], + [11, 0, 3, 1], + [12, 1, 4, NaN], + [13, 0, 2, 3], + [14, -1, 1, 4]]; + + var h_row; + var h_pts; + + var highlightCallback = function(e, x, pts, row) { + h_row = row; + h_pts = pts; + }; + + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, dataNaN, + { + width: 600, + height: 400, + labels: ['x', 'a', 'b', 'c'], + visibility: [false, true, true], + highlightCallback: highlightCallback + }); + + DygraphOps.dispatchMouseMove(g, 10.1, 0.9); + //check correct row is returned + assertEquals(1, h_row); + + // Explicitly test closest point algorithms + var dom = g.toDomCoords(10.1, 0.9); + assertEquals(1, g.findClosestRow(dom[0])); + + var res = g.findClosestPoint(dom[0], dom[1]); + assertEquals(1, res.row); + assertEquals('b', res.seriesName); + + res = g.findStackedPoint(dom[0], dom[1]); + assertEquals(1, res.row); + assertEquals('c', res.seriesName); +}; + +/** + * This tests that stacked point searches work for data containing NaNs. + */ +CallbackTestCase.prototype.testNaNDataStack = function() { + var dataNaN = [ + [9, -1, NaN, NaN], + [10, -1, 1, 2], + [11, 0, 3, 1], + [12, 1, NaN, 2], + [13, 0, 2, 3], + [14, -1, 1, 4], + [15, 0, 2, NaN], + [16, 1, 1, 3], + [17, 1, NaN, 3], + [18, 0, 2, 5], + [19, 0, 1, 4]]; + + var h_row; + var h_pts; + + var highlightCallback = function(e, x, pts, row) { + h_row = row; + h_pts = pts; + }; + + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, dataNaN, + { + width: 600, + height: 400, + labels: ['x', 'a', 'b', 'c'], + visibility: [false, true, true], + stackedGraph: true, + highlightCallback: highlightCallback + }); + + DygraphOps.dispatchMouseMove(g, 10.1, 0.9); + //check correct row is returned + assertEquals(1, h_row); + + // Explicitly test stacked point algorithm. + var dom = g.toDomCoords(10.1, 0.9); + var res = g.findStackedPoint(dom[0], dom[1]); + assertEquals(1, res.row); + assertEquals('c', res.seriesName); + + // First gap, no data due to NaN contagion. + dom = g.toDomCoords(12.1, 0.9); + res = g.findStackedPoint(dom[0], dom[1]); + assertEquals(3, res.row); + assertEquals(undefined, res.seriesName); + + // Second gap, no data due to NaN contagion. + dom = g.toDomCoords(15.1, 0.9); + res = g.findStackedPoint(dom[0], dom[1]); + assertEquals(6, res.row); + assertEquals(undefined, res.seriesName); + + // Isolated points should work, finding series b in this case. + dom = g.toDomCoords(15.9, 3.1); + res = g.findStackedPoint(dom[0], dom[1]); + assertEquals(7, res.row); + assertEquals('b', res.seriesName); +}; + +CallbackTestCase.prototype.testGapHighlight = function() { + var dataGap = [ + [1, null, 3], + [2, 2, null], + [3, null, 5], + [4, 4, null], + [5, null, 7], + [6, NaN, null], + [8, 8, null], + [10, 10, null]]; + + var h_row; + var h_pts; + + var highlightCallback = function(e, x, pts, row) { + h_row = row; + h_pts = pts; + }; + + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, dataGap, { + width: 400, + height: 300, + //stackedGraph: true, + connectSeparatedPoints: true, + drawPoints: true, + labels: ['x', 'A', 'B'], + highlightCallback : highlightCallback + }); + + DygraphOps.dispatchMouseMove(g, 1.1, 10); + //point from series B + assertEquals(0, h_row); + assertEquals(1, h_pts.length); + assertEquals(3, h_pts[0].yval); + assertEquals('B', h_pts[0].name); + + DygraphOps.dispatchMouseMove(g, 6.1, 10); + // A is NaN at x=6 + assertEquals(1, h_pts.length); + assert(isNaN(h_pts[0].yval)); + assertEquals('A', h_pts[0].name); + + DygraphOps.dispatchMouseMove(g, 8.1, 10); + //point from series A + assertEquals(6, h_row); + assertEquals(1, h_pts.length); + assertEquals(8, h_pts[0].yval); + assertEquals('A', h_pts[0].name); +};