X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=auto_tests%2Ftests%2Fstep_plot_per_series.js;h=a5ff5ee8d2d33f1a248c00542134c8814a081969;hb=refs%2Fheads%2F558-fill-artifacts;hp=d1bf32336a59fc0ebb6a5ad65bc7b21012c8c285;hpb=400a62b3df5b199814df17d57423f8c789d132de;p=dygraphs.git diff --git a/auto_tests/tests/step_plot_per_series.js b/auto_tests/tests/step_plot_per_series.js index d1bf323..a5ff5ee 100644 --- a/auto_tests/tests/step_plot_per_series.js +++ b/auto_tests/tests/step_plot_per_series.js @@ -1,35 +1,46 @@ /** * @fileoverview Test cases for the option "stepPlot" especially for the scenario where the option is not set for the whole graph but for single series. * + * TODO(danvk): delete this test once dpxdt screenshot tests are part of the + * main dygraphs repo. The tests have extremely specific expectations about + * how drawing is performed. It's more realistic to test the resulting + * pixels. + * * @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG) */ -var StepTestCase = TestCase("step-plot-per-series"); +describe("step-plot-per-series", function() { -StepTestCase.prototype.setUp = function() { +beforeEach(function() { document.body.innerHTML = "
"; -}; +}); -StepTestCase.origFunc = Dygraph.getContext; +var origFunc = Dygraph.getContext; -StepTestCase.prototype.setUp = function() { +beforeEach(function() { document.body.innerHTML = ""; Dygraph.getContext = function(canvas) { - return new Proxy(StepTestCase.origFunc(canvas)); + return new Proxy(origFunc(canvas)); }; -}; +}); -StepTestCase.prototype.tearDown = function() { - Dygraph.getContext = StepTestCase.origFunc; -}; +afterEach(function() { + Dygraph.getContext = origFunc; +}); -StepTestCase.prototype.testMixedModeStepAndLineFilled = function() { +it('testMixedModeStepAndLineFilled', 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, + } + }, errorBars: false, labels: ["X", "Idle", "Used"], series: { @@ -52,7 +63,7 @@ StepTestCase.prototype.testMixedModeStepAndLineFilled = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; var attrs = {}; @@ -83,16 +94,22 @@ StepTestCase.prototype.testMixedModeStepAndLineFilled = function() { xy2 = g.toDomCoords(x2, y2); CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); } -}; +}); -StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() { +it('testMixedModeStepAndLineStackedAndFilled', 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, + } + }, errorBars: false, labels: ["X", "Idle", "Used", "NotUsed", "Active"], series: { @@ -117,7 +134,7 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; var attrs = {}; @@ -148,7 +165,7 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() { CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x2, y2base); - CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); + // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x1, y1base); CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); @@ -172,7 +189,7 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() { CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x2, y2base); - CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); + // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x1, y1base); CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); @@ -201,7 +218,7 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() { CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x2, y2base); - CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); + // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x1, y1base); CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); @@ -225,23 +242,29 @@ StepTestCase.prototype.testMixedModeStepAndLineStackedAndFilled = function() { CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x2, y2base); - CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); + // CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); xy1 = xy2; xy2 = g.toDomCoords(x1, y1base); CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); // The last edge can not be tested via assertLineDrawn since it wasn't drawn as a line but via clossePath. // But a rectangle is completely tested with three of its four edges. } -}; +}); -StepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() { +it('testMixedModeStepAndLineErrorBars', 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, + } + }, errorBars: true, sigma: 1, labels: ["X", "Data1", "Data2"], @@ -261,7 +284,7 @@ StepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; var attrs = {}; @@ -325,16 +348,22 @@ StepTestCase.prototype.testMixedModeStepAndLineErrorBars = function() { CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); } -}; +}); -StepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() { +it('testMixedModeStepAndLineCustomBars', 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, labels: ["X", "Data1", "Data2"], series: { @@ -353,7 +382,7 @@ StepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; var attrs = {}; @@ -418,4 +447,6 @@ StepTestCase.prototype.testMixedModeStepAndLineCustomBars = function() { xy2 = g.toDomCoords(data[i + 1][0], data[i + 1][2][1]); CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); } -}; +}); + +});