X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=auto_tests%2Ftests%2Ferror_bars.js;h=2bcee2fbcba2bd6e4da33688c1ee45d82a47fbdb;hb=ef44ba44d235f6e6fbbc3ae481661380cb6514be;hp=8bc20e3f7c09a2e2a8ff1974a1228c1065f37b14;hpb=436943f9fee49b1f892480f04f0dc4d5abc5fca0;p=dygraphs.git diff --git a/auto_tests/tests/error_bars.js b/auto_tests/tests/error_bars.js index 8bc20e3..2bcee2f 100644 --- a/auto_tests/tests/error_bars.js +++ b/auto_tests/tests/error_bars.js @@ -9,26 +9,32 @@ errorBarsTestCase.prototype.setUp = function() { document.body.innerHTML = "
"; }; -var _origFunc = Dygraph.getContext; +errorBarsTestCase._origFunc = Dygraph.getContext; errorBarsTestCase.prototype.setUp = function() { document.body.innerHTML = ""; Dygraph.getContext = function(canvas) { - return new Proxy(_origFunc(canvas)); + return new Proxy(errorBarsTestCase._origFunc(canvas)); } }; errorBarsTestCase.prototype.tearDown = function() { - Dygraph.getContext = _origFunc; + Dygraph.getContext = errorBarsTestCase._origFunc; }; errorBarsTestCase.prototype.testErrorBarsDrawn = function() { var opts = { width: 480, height: 320, - drawXGrid: false, - drawYGrid: false, - drawXAxis: false, - drawYAxis: false, + axes : { + x : { + drawGrid: false, + drawAxis: false, + }, + y : { + drawGrid: false, + drawAxis: false, + } + }, customBars: true, errorBars: true }; @@ -86,5 +92,95 @@ errorBarsTestCase.prototype.testErrorBarsDrawn = function() { xy2 = g.toDomCoords(data[i + 1][0], data[i + 1][1][1]); CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); } + g.destroy(); // Restore balanced saves and restores. + CanvasAssertions.assertBalancedSaveRestore(htx); }; +errorBarsTestCase.prototype.testErrorBarsCorrectColors = function() { + // Two constant series with constant error. + var data = [ + [0, [100, 50], [200, 50]], + [1, [100, 50], [200, 50]] + ]; + + var opts = { + errorBars: true, + sigma: 1.0, + fillAlpha: 0.15, + colors: ['#00ff00', '#0000ff'], + axes : { + x : { + drawGrid: false, + drawAxis: false, + }, + y : { + drawGrid: false, + drawAxis: false, + } + }, + width: 400, + height: 300, + valueRange: [0, 300], + labels: ['X', 'Y1', 'Y2'] + }; + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, data, opts); + + // y-pixels (0=top, 299=bottom) + // 0- 48: empty (white) + // 49- 98: Y2 error bar + // 99: Y2 center line + // 100-148: Y2 error bar + // 149-198: Y1 error bar + // 199: Y1 center line + // 200-248: Y1 error bar + // 249-299: empty (white) + // TODO(danvk): test the edges of these regions. + + assertEquals([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 75)); + assertEquals([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 125)); + assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 175)); + assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 225)); +}; + + +// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=392 +errorBarsTestCase.prototype.testRollingAveragePreservesNaNs = function() { + var graph = document.getElementById("graph"); + var data = + [ + [1, [null, null], [3,1]], + [2, [2, 1], [null, null]], + [3, [null, null], [5,1]], + [4, [4, 0.5], [null, null]], + [5, [null, null], [7,1]], + [6, [NaN, NaN], [null, null]], + [8, [8, 1], [null, null]], + [10, [10, 1], [null, null]] + ]; + var g = new Dygraph(graph, data, + { + labels: ['x', 'A', 'B' ], + connectSeparatedPoints: true, + drawPoints: true, + errorBars: true + } + ); + + var in_series = g.dataHandler_.extractSeries(data, 1, g.attributes_); + + assertEquals(null, in_series[4][1]); + assertEquals(null, in_series[4][2][0]); + assertEquals(null, in_series[4][2][1]); + assertNaN(in_series[5][1]); + assertNaN(in_series[5][2][0]); + assertNaN(in_series[5][2][1]); + + var out_series = g.dataHandler_.rollingAverage(in_series, 1, g.attributes_); + assertNaN(out_series[5][1]); + assertNaN(out_series[5][2][0]); + assertNaN(out_series[5][2][1]); + assertEquals(null, out_series[4][1]); + assertEquals(null, out_series[4][2][0]); + assertEquals(null, out_series[4][2][1]); +};