X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fstacked.js;h=d3add124aa393b5d196c00faeffc405af65d2d25;hb=89fdcedbda6906d90e15d84285c4f6c0b8d96d28;hp=1185f191a8211c62dc29eaab522eab12c7dbca63;hpb=192d58e7c9fab1ae32da4a2dac723955f1639a54;p=dygraphs.git diff --git a/auto_tests/tests/stacked.js b/auto_tests/tests/stacked.js index 1185f19..d3add12 100644 --- a/auto_tests/tests/stacked.js +++ b/auto_tests/tests/stacked.js @@ -3,30 +3,36 @@ * * @author dan@dygraphs.com (Dan Vanderkam) */ -var stackedTestCase = TestCase("stacked"); +describe("stacked", function() { -stackedTestCase._origGetContext = Dygraph.getContext; +var _origGetContext = Dygraph.getContext; -stackedTestCase.prototype.setUp = function() { +beforeEach(function() { document.body.innerHTML = "
"; Dygraph.getContext = function(canvas) { - return new Proxy(stackedTestCase._origGetContext(canvas)); + return new Proxy(_origGetContext(canvas)); } -}; +}); -stackedTestCase.prototype.tearDown = function() { - Dygraph.getContext = stackedTestCase._origGetContext; -}; +afterEach(function() { + Dygraph.getContext = _origGetContext; +}); -stackedTestCase.prototype.testCorrectColors = function() { +it('testCorrectColors', function() { var opts = { width: 400, height: 300, stackedGraph: true, - drawXGrid: false, - drawYGrid: false, - drawXAxis: false, - drawYAxis: false, + axes : { + x : { + drawGrid: false, + drawAxis: false, + }, + y : { + drawGrid: false, + drawAxis: false, + } + }, valueRange: [0, 3], colors: ['#00ff00', '#0000ff'], fillAlpha: 0.15 @@ -48,12 +54,12 @@ stackedTestCase.prototype.testCorrectColors = function() { // y pixels 0-99 = nothing (white) // 38 = round(0.15 * 255) - assertEquals([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 250)); - assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 150)); -}; + assert.deepEqual([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 250)); + assert.deepEqual([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 150)); +}); // Regression test for http://code.google.com/p/dygraphs/issues/detail?id=358 -stackedTestCase.prototype.testSelectionValues = function() { +it('testSelectionValues', function() { var opts = { stackedGraph: true }; @@ -65,11 +71,11 @@ stackedTestCase.prototype.testSelectionValues = function() { ; var graph = document.getElementById("graph"); - g = new Dygraph(graph, data, opts); + var g = new Dygraph(graph, data, opts); g.setSelection(0); - assertEquals("0: Y1: 1 Y2: 1", Util.getLegend()); + assert.equal("0: Y1: 1 Y2: 1", Util.getLegend()); // Verify that the behavior is correct with highlightSeriesOpts as well. g.updateOptions({ @@ -78,17 +84,17 @@ stackedTestCase.prototype.testSelectionValues = function() { } }); g.setSelection(0); - assertEquals("0: Y1: 1 Y2: 1", Util.getLegend()); + assert.equal("0: Y1: 1 Y2: 1", Util.getLegend()); g.setSelection(1); - assertEquals("1: Y1: 1 Y2: 1", Util.getLegend()); + assert.equal("1: Y1: 1 Y2: 1", Util.getLegend()); g.setSelection(0, 'Y2'); - assertEquals("0: Y1: 1 Y2: 1", Util.getLegend()); -}; + assert.equal("0: Y1: 1 Y2: 1", Util.getLegend()); +}); // Regression test for http://code.google.com/p/dygraphs/issues/detail?id=176 -stackedTestCase.prototype.testDuplicatedXValue = function() { +it('testDuplicatedXValue', function() { var opts = { stackedGraph: true, fillAlpha: 0.15, @@ -105,17 +111,17 @@ stackedTestCase.prototype.testDuplicatedXValue = function() { ; var graph = document.getElementById("graph"); - g = new Dygraph(graph, data, opts); + var g = new Dygraph(graph, data, opts); assert(g.yAxisRange()[1] < 2); - assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 250)); - assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 317, 250)); -} + assert.deepEqual([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 250)); + assert.deepEqual([0, 255, 0, 38], Util.samplePixel(g.hidden_, 317, 250)); +}); // Validates regression when null values in stacked graphs show up // incorrectly in the legend. -stackedTestCase.prototype.testNullValues = function() { +it('testNullValues', function() { var opts = { stackedGraph: true, stepPlot:true @@ -129,26 +135,26 @@ stackedTestCase.prototype.testNullValues = function() { ; var graph = document.getElementById("graph"); - g = new Dygraph(graph, data, opts); + var g = new Dygraph(graph, data, opts); g.setSelection(0); - assertEquals("0: Y1: -5 Y2: -1 Y3: 1", Util.getLegend()); + assert.equal("0: Y1: -5 Y2: -1 Y3: 1", Util.getLegend()); g.setSelection(1); - assertEquals("1: Y1: 1 Y3: 1", Util.getLegend()); + assert.equal("1: Y1: 1 Y3: 1", Util.getLegend()); g.setSelection(2); - assertEquals("2: Y1: 1 Y2: 2 Y3: 3", Util.getLegend()); + assert.equal("2: Y1: 1 Y2: 2 Y3: 3", Util.getLegend()); g.setSelection(3); - assertEquals("3: Y1: 3 Y3: 4", Util.getLegend()); + assert.equal("3: Y1: 3 Y3: 4", Util.getLegend()); g.setSelection(4); - assertEquals("4: Y1: 3 Y2: 2 Y3: 3", Util.getLegend()); -}; + assert.equal("4: Y1: 3 Y2: 2 Y3: 3", Util.getLegend()); +}); // Regression test for http://code.google.com/p/dygraphs/issues/detail?id=438 -stackedTestCase.prototype.testMissingValueAtZero = function() { +it('testMissingValueAtZero', function() { var opts = { stackedGraph: true }; @@ -159,19 +165,19 @@ stackedTestCase.prototype.testMissingValueAtZero = function() { ; var graph = document.getElementById("graph"); - g = new Dygraph(graph, data, opts); + var g = new Dygraph(graph, data, opts); g.setSelection(0); - assertEquals("0: Y2: 1", Util.getLegend()); + assert.equal("0: Y2: 1", Util.getLegend()); g.setSelection(1); - assertEquals("1: Y1: 1 Y2: 2", Util.getLegend()); + assert.equal("1: Y1: 1 Y2: 2", Util.getLegend()); g.setSelection(2); - assertEquals("2: Y2: 3", Util.getLegend()); -}; + assert.equal("2: Y2: 3", Util.getLegend()); +}); -stackedTestCase.prototype.testInterpolation = function() { +it('testInterpolation', function() { var opts = { colors: ['#ff0000', '#00ff00', '#0000ff'], stackedGraph: true @@ -193,7 +199,7 @@ stackedTestCase.prototype.testInterpolation = function() { [109, 1, N, N, N]]; var graph = document.getElementById("graph"); - g = new Dygraph(graph, data, opts); + var g = new Dygraph(graph, data, opts); var htx = g.hidden_ctx_; var attrs = {}; @@ -211,23 +217,23 @@ stackedTestCase.prototype.testInterpolation = function() { // Check that the expected number of line segments gets drawn // for each series. Gaps don't get a line. - assertEquals(7, CanvasAssertions.numLinesDrawn(htx, '#ff0000')); - assertEquals(4, CanvasAssertions.numLinesDrawn(htx, '#00ff00')); - assertEquals(2, CanvasAssertions.numLinesDrawn(htx, '#0000ff')); + assert.equal(7, CanvasAssertions.numLinesDrawn(htx, '#ff0000')); + assert.equal(4, CanvasAssertions.numLinesDrawn(htx, '#00ff00')); + assert.equal(2, CanvasAssertions.numLinesDrawn(htx, '#0000ff')); // Check that the selection returns the original (non-stacked) // values and skips gaps. g.setSelection(1); - assertEquals("101: Y1: 1 Y2: 2 Y3: 2", Util.getLegend()); + assert.equal("101: Y1: 1 Y2: 2 Y3: 2", Util.getLegend()); g.setSelection(8); - assertEquals("108: Y1: 1 Y2: 2 Y3: 9", Util.getLegend()); + assert.equal("108: Y1: 1 Y2: 2 Y3: 9", Util.getLegend()); g.setSelection(9); - assertEquals("109: Y1: 1", Util.getLegend()); -}; + assert.equal("109: Y1: 1", Util.getLegend()); +}); -stackedTestCase.prototype.testInterpolationOptions = function() { +it('testInterpolationOptions', function() { var opts = { colors: ['#ff0000', '#00ff00', '#0000ff'], stackedGraph: true @@ -249,7 +255,7 @@ stackedTestCase.prototype.testInterpolationOptions = function() { for (var i = 0; i < choices.length; ++i) { var graph = document.getElementById("graph"); opts['stackedGraphNaNFill'] = choices[i]; - g = new Dygraph(graph, data, opts); + var g = new Dygraph(graph, data, opts); var htx = g.hidden_ctx_; var attrs = {}; @@ -263,4 +269,77 @@ stackedTestCase.prototype.testInterpolationOptions = function() { {strokeStyle: '#ff0000'}); } } -}; +}); + +it('testMultiAxisInterpolation', function() { + // Setting 2 axes to test that each axis stacks separately + var opts = { + colors: ['#ff0000', '#00ff00', '#0000ff'], + stackedGraph: true, + series: { + "Y1": { + axis: 'y', + }, + "Y2": { + axis: 'y', + }, + "Y3": { + axis: 'y2', + }, + "Y4": { + axis: 'y2', + } + } + }; + + // The last series is all-NaN, it ought to be treated as all zero + // for stacking purposes. + var N = NaN; + var data = [ + [100, 1, 2, N, N], + [101, 1, 2, 2, N], + [102, 1, N, N, N], + [103, 1, 2, 4, N], + [104, N, N, N, N], + [105, 1, 2, N, N], + [106, 1, 2, 7, N], + [107, 1, 2, 8, N], + [108, 1, 2, 9, N], + [109, 1, N, N, N]]; + + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, data, opts); + + var htx = g.hidden_ctx_; + var attrs = {}; + + // Check that lines are drawn at the expected positions, using + // interpolated values for missing data. + CanvasAssertions.assertLineDrawn( + htx, g.toDomCoords(100, 2), g.toDomCoords(101, 2), {strokeStyle: '#00ff00'}); + CanvasAssertions.assertLineDrawn( + htx, g.toDomCoords(102, 3), g.toDomCoords(103, 3), {strokeStyle: '#ff0000'}); + CanvasAssertions.assertLineDrawn( + htx, g.toDomCoords(107, 2.71), g.toDomCoords(108, 3), {strokeStyle: '#0000ff'}); + CanvasAssertions.assertLineDrawn( + htx, g.toDomCoords(108, 3), g.toDomCoords(109, 3), {strokeStyle: '#ff0000'}); + + // Check that the expected number of line segments gets drawn + // for each series. Gaps don't get a line. + assert.equal(7, CanvasAssertions.numLinesDrawn(htx, '#ff0000')); + assert.equal(4, CanvasAssertions.numLinesDrawn(htx, '#00ff00')); + assert.equal(2, CanvasAssertions.numLinesDrawn(htx, '#0000ff')); + + // Check that the selection returns the original (non-stacked) + // values and skips gaps. + g.setSelection(1); + assert.equal("101: Y1: 1 Y2: 2 Y3: 2", Util.getLegend()); + + g.setSelection(8); + assert.equal("108: Y1: 1 Y2: 2 Y3: 9", Util.getLegend()); + + g.setSelection(9); + assert.equal("109: Y1: 1", Util.getLegend()); +}); + +});