X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Fgrid_per_axis.js;h=cac2534acf6c73baf6a6567237c587160791c950;hb=refs%2Fheads%2F461-retina;hp=1e71aad03a6b1817c9c65b9452d3e2d87b181201;hpb=4a0567daedb72437ba4b780f3f13670a1467d38c;p=dygraphs.git diff --git a/auto_tests/tests/grid_per_axis.js b/auto_tests/tests/grid_per_axis.js index 1e71aad..cac2534 100644 --- a/auto_tests/tests/grid_per_axis.js +++ b/auto_tests/tests/grid_per_axis.js @@ -1,30 +1,29 @@ /** - * @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. + * @fileoverview Test cases for the per-axis grid options, including the new + * option "gridLinePattern". * * @author david.eberlein@ch.sauter-bc.com (Fr. Sauter AG) */ -var StepTestCase = TestCase("grid_per_axis"); +var GridPerAxisTestCase = TestCase("grid-per-axis"); -StepTestCase.prototype.setUp = function() { +GridPerAxisTestCase.prototype.setUp = function() { document.body.innerHTML = "
"; }; -StepTestCase.origFunc = Dygraph.getContext; +GridPerAxisTestCase.origFunc = Dygraph.getContext; -StepTestCase.prototype.setUp = function() { +GridPerAxisTestCase.prototype.setUp = function() { document.body.innerHTML = ""; Dygraph.getContext = function(canvas) { - return new Proxy(StepTestCase.origFunc(canvas)); + return new Proxy(GridPerAxisTestCase.origFunc(canvas)); }; }; -StepTestCase.prototype.tearDown = function() { - Dygraph.getContext = StepTestCase.origFunc; +GridPerAxisTestCase.prototype.tearDown = function() { + Dygraph.getContext = GridPerAxisTestCase.origFunc; }; -StepTestCase.prototype.testIndependantGrids = function() { +GridPerAxisTestCase.prototype.testIndependentGrids = function() { var opts = { width : 480, height : 320, @@ -84,7 +83,7 @@ StepTestCase.prototype.testIndependantGrids = function() { } }; -StepTestCase.prototype.testPerAxisGridColors = function() { +GridPerAxisTestCase.prototype.testPerAxisGridColors = function() { var opts = { width : 480, height : 320, @@ -142,7 +141,7 @@ StepTestCase.prototype.testPerAxisGridColors = function() { } } }; -StepTestCase.prototype.testPerAxisGridWidth = function() { +GridPerAxisTestCase.prototype.testPerAxisGridWidth = function() { var opts = { width : 480, height : 320, @@ -182,6 +181,8 @@ StepTestCase.prototype.testPerAxisGridWidth = function() { var y2Gridlines = [ 50, 100, 150, 200, 250, 350 ]; var gridlines = [ yGridlines, y2Gridlines ]; var xGridlines = [ 2, 3, 4 ]; + var gridColor = [ 255, 0, 0 ]; + var emptyColor = [ 0, 0, 0 ]; function halfUp(x) { return Math.round(x) + 1; @@ -196,32 +197,35 @@ StepTestCase.prototype.testPerAxisGridWidth = function() { // Step through all gridlines of the axis for ( var i = 0; i < gridlines[axis].length; i++) { y = halfDown(g.toDomYCoord(gridlines[axis][i], axis)); - var drawnPixeldown2 = Util.samplePixel(g.hidden_, x, y - 2); - var drawnPixeldown1 = Util.samplePixel(g.hidden_, x, y - 1); - var drawnPixel = Util.samplePixel(g.hidden_, x, y); - var drawnPixelup1 = Util.samplePixel(g.hidden_, x, y + 1); - var drawnPixelup2 = Util.samplePixel(g.hidden_, x, y + 2); + // Ignore the alpha value + + // FIXME(pholden): this test fails with a context pixel ratio of 2. + var drawnPixeldown2 = Util.samplePixel(g.hidden_, x, y - 2).slice(0, 3); + var drawnPixeldown1 = Util.samplePixel(g.hidden_, x, y - 1).slice(0, 3); + var drawnPixel = Util.samplePixel(g.hidden_, x, y).slice(0, 3); + var drawnPixelup1 = Util.samplePixel(g.hidden_, x, y + 1).slice(0, 3); + var drawnPixelup2 = Util.samplePixel(g.hidden_, x, y + 2).slice(0, 3); // Check the grid width. switch (axis) { case 0: // y with 2 pixels width - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 0, 0, 0, 0 ], drawnPixeldown2); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 255, 0, 0, 127 ], drawnPixeldown1); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 255, 0, 0, 255 ], drawnPixel); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 255, 0, 0, 128 ], drawnPixelup1); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 0, 0, 0, 0 ], drawnPixelup2); + assertEquals("Unexpected y-grid color found at pixel: x: " + x + "y: " + + y, emptyColor, drawnPixeldown2); + assertEquals("Unexpected y-grid color found at pixel: x: " + x + "y: " + + y, gridColor, drawnPixeldown1); + assertEquals("Unexpected y-grid color found at pixel: x: " + x + "y: " + + y, gridColor, drawnPixel); + assertEquals("Unexpected y-grid color found at pixel: x: " + x + "y: " + + y, gridColor, drawnPixelup1); + assertEquals("Unexpected y-grid color found at pixel: x: " + x + "y: " + + y, emptyColor, drawnPixelup2); break; case 1: // y2 with 1 pixel width - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 0, 0, 0, 0 ], drawnPixeldown1); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 255, 0, 0, 255 ], drawnPixel); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 0, 0, 0, 0 ], drawnPixelup1); + assertEquals("Unexpected y2-grid color found at pixel: x: " + x + "y: " + + y, emptyColor, drawnPixeldown1); + assertEquals("Unexpected y2-grid color found at pixel: x: " + x + "y: " + + y, gridColor, drawnPixel); + assertEquals("Unexpected y2-grid color found at pixel: x: " + x + "y: " + + y, emptyColor, drawnPixelup1); break; } } @@ -231,25 +235,26 @@ StepTestCase.prototype.testPerAxisGridWidth = function() { y = halfDown(g.plotter_.area.y) + 10; for ( var i = 0; i < xGridlines.length; i++) { x = halfUp(g.toDomXCoord(xGridlines[i])); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " + y, [ - 0, 0, 0, 0 ], Util.samplePixel(g.hidden_, x - 4, y)); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " + y, [ - 255, 0, 0, 128 ], Util.samplePixel(g.hidden_, x - 3, y)); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " + y, [ - 255, 0, 0, 255 ], Util.samplePixel(g.hidden_, x - 2, y)); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " + y, [ - 255, 0, 0, 255 ], Util.samplePixel(g.hidden_, x - 1, y)); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " + y, [ - 255, 0, 0, 255 ], Util.samplePixel(g.hidden_, x, y)); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " + y, [ - 255, 0, 0, 128 ], Util.samplePixel(g.hidden_, x + 1, y)); - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " + y, [ - 0, 0, 0, 0 ], Util.samplePixel(g.hidden_, x + 2, y)); + assertEquals("Unexpected x-grid color found at pixel: x: " + x + "y: " + y, + emptyColor, Util.samplePixel(g.hidden_, x - 4, y).slice(0, 3)); + assertEquals("Unexpected x-grid color found at pixel: x: " + x + "y: " + y, + gridColor, Util.samplePixel(g.hidden_, x - 3, y).slice(0, 3)); + assertEquals("Unexpected x-grid color found at pixel: x: " + x + "y: " + y, + gridColor, Util.samplePixel(g.hidden_, x - 2, y).slice(0, 3)); + assertEquals("Unexpected x-grid color found at pixel: x: " + x + "y: " + y, + gridColor, Util.samplePixel(g.hidden_, x - 1, y).slice(0, 3)); + assertEquals("Unexpected x-grid color found at pixel: x: " + x + "y: " + y, + gridColor, Util.samplePixel(g.hidden_, x, y).slice(0, 3)); + assertEquals("Unexpected x-grid color found at pixel: x: " + x + "y: " + y, + gridColor, Util.samplePixel(g.hidden_, x + 1, y).slice(0, 3)); + assertEquals("Unexpected x-grid color found at pixel: x: " + x + "y: " + y, + emptyColor, Util.samplePixel(g.hidden_, x + 2, y).slice(0, 3)); } }; -StepTestCase.prototype.testGridLinePattern = function() { + +GridPerAxisTestCase.prototype.testGridLinePattern = function() { var opts = { - width : 480, + width : 120, height : 320, errorBars : false, drawXGrid : false, @@ -268,7 +273,7 @@ StepTestCase.prototype.testGridLinePattern = function() { axes : { y : { gridLineColor : "#0000ff", - gridLinePattern : [ 4, 4 ] + gridLinePattern : [ 10, 10 ] } } }; @@ -288,22 +293,26 @@ StepTestCase.prototype.testGridLinePattern = function() { return Math.round(y) - 1; } var x, y; - x = halfUp(g.plotter_.area.x); // Step through all gridlines of the axis - for ( var i = 0; i < yGridlines.length; i++) { + for (var i = 0; i < yGridlines.length; i++) { y = halfDown(g.toDomYCoord(yGridlines[i], 0)); // Step through the pixels of the line and test the pattern. - for (x; x < g.plotter_.area.w; x++) { - var drawnPixel = Util.samplePixel(g.hidden_, x, y); - var pattern = (Math.floor((x) / 4)) % 2; + for (x = halfUp(g.plotter_.area.x); x < g.plotter_.area.w; x++) { + // avoid checking the edge pixels since they differ depending on the OS. + var pixelpos = x % 10; + if(pixelpos < 1 || pixelpos > 8) continue; + + // Ignore alpha + var drawnPixel = Util.samplePixel(g.hidden_, x, y).slice(0,3); + var pattern = (Math.floor((x) / 10)) % 2; switch (pattern) { case 0: // fill - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 0, 0, 255, 77 ], drawnPixel); + assertEquals("Unexpected filled grid-pattern color found at pixel: x: " + x + " y: " + + y, [ 0, 0, 255 ], drawnPixel); break; case 1: // no fill - assertEquals("Unexpected grid color found at pixel: x: " + x + "y: " - + y, [ 0, 0, 0, 0 ], drawnPixel); + assertEquals("Unexpected empty grid-pattern color found at pixel: x: " + x + " y: " + + y, [ 0, 0, 0 ], drawnPixel); break; } }