X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Faxis_labels.js;h=c9f60f83ac682c98252f29a714ac1b1c0df26f07;hb=7d8320a97033e4ed8968d12b513bfb7d104c9528;hp=56ddf3db1725185c031cb1a131244d8a02e57ce5;hpb=e41ef65aa9e87306657157c0663032e5ea9547fe;p=dygraphs.git diff --git a/auto_tests/tests/axis_labels.js b/auto_tests/tests/axis_labels.js index 56ddf3d..c9f60f8 100644 --- a/auto_tests/tests/axis_labels.js +++ b/auto_tests/tests/axis_labels.js @@ -55,7 +55,7 @@ AxisLabelsTestCase.prototype.testMinusOneToOne = function() { assertEquals(['0','20','40','60','80','100'], Util.getYLabels()); g.setSelection(0); - assertEquals('0: Y:-1', Util.getLegend()); + assertEquals('0: Y: -1', Util.getLegend()); }; AxisLabelsTestCase.prototype.testSmallRangeNearZero = function() { @@ -88,7 +88,7 @@ AxisLabelsTestCase.prototype.testSmallRangeNearZero = function() { Util.makeNumbers(Util.getYLabels())); g.setSelection(1); - assertEquals('1: Y:0', Util.getLegend()); + assertEquals('1: Y: 0', Util.getLegend()); }; AxisLabelsTestCase.prototype.testSmallRangeAwayFromZero = function() { @@ -119,7 +119,7 @@ AxisLabelsTestCase.prototype.testSmallRangeAwayFromZero = function() { assertEquals(["10","10","10","10","10","10","10","10","10","10"], Util.getYLabels()); g.setSelection(1); - assertEquals('1: Y:0', Util.getLegend()); + assertEquals('1: Y: 0', Util.getLegend()); }; AxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter = function() { @@ -152,7 +152,7 @@ AxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter = function() { // The legend does not use the axisLabelFormatter: g.setSelection(1); - assertEquals('5.1: Y1:1', Util.getLegend()); + assertEquals('5.1: Y1: 1', Util.getLegend()); }; AxisLabelsTestCase.prototype.testAxisLabelFormatter = function () { @@ -192,7 +192,7 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatter = function () { assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels()); g.setSelection(2); - assertEquals("2: y:4", Util.getLegend()); + assertEquals("2: y: 4", Util.getLegend()); }; AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () { @@ -232,7 +232,7 @@ AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () { assertEquals(['y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels()); g.setSelection(0); - assertEquals("2011/01/01: y:2", Util.getLegend()); + assertEquals("2011/01/01: y: 2", Util.getLegend()); }; // This test verifies that when a valueFormatter is set (but not an @@ -278,7 +278,7 @@ AxisLabelsTestCase.prototype.testValueFormatter = function () { // they do affect the legend, however. g.setSelection(2); - assertEquals("x2: y:y4", Util.getLegend()); + assertEquals("x2: y: y4", Util.getLegend()); }; AxisLabelsTestCase.prototype.testDateValueFormatter = function () { @@ -321,7 +321,7 @@ AxisLabelsTestCase.prototype.testDateValueFormatter = function () { // the valueFormatter options also affect the legend. g.setSelection(2); - assertEquals('x2011/01/03: y:y6', Util.getLegend()); + assertEquals('x2011/01/03: y: y6', Util.getLegend()); }; // This test verifies that when both a valueFormatter and an axisLabelFormatter @@ -361,7 +361,7 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatterPrecedence = function () { assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels()); g.setSelection(9); - assertEquals("xvf9: y:yvf18", Util.getLegend()); + assertEquals("xvf9: y: yvf18", Util.getLegend()); }; // This is the same as the previous test, except that options are added @@ -419,7 +419,7 @@ AxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = function () { assertEquals(['y0','y2','y4','y6','y8','y10','y12','y14','y16','y18'], Util.getYLabels()); g.setSelection(9); - assertEquals("xvf9: y:yvf18", Util.getLegend()); + assertEquals("xvf9: y: yvf18", Util.getLegend()); }; AxisLabelsTestCase.prototype.testGlobalFormatters = function() { @@ -445,7 +445,7 @@ AxisLabelsTestCase.prototype.testGlobalFormatters = function() { assertEquals(['alf0','alf2','alf4','alf6','alf8','alf10','alf12','alf14','alf16','alf18'], Util.getYLabels()); g.setSelection(9); - assertEquals("vf9: y:vf18", Util.getLegend()); + assertEquals("vf9: y: vf18", Util.getLegend()); }; AxisLabelsTestCase.prototype.testSeriesOrder = function() { @@ -464,7 +464,7 @@ AxisLabelsTestCase.prototype.testSeriesOrder = function() { var g = new Dygraph(graph, data, opts); g.setSelection(2); - assertEquals('2: 00:103 01:203 10:303 11:403', Util.getLegend()); + assertEquals('2: 00: 103 01: 203 10: 303 11: 403', Util.getLegend()); // Sanity checks for indexFromSetName assertEquals(0, g.indexFromSetName("x")); @@ -569,72 +569,52 @@ AxisLabelsTestCase.prototype.testIncludeZero = function() { AxisLabelsTestCase.prototype.testAxisLabelFontSize = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, AxisLabelsTestCase.simpleData, {}); - var assertSize = function(className, size) { - var sizePx = size + "px"; - var labels = graph.getElementsByClassName(className); - assertTrue(labels.length > 0); - - // window.getComputedStyle is apparently compatible with all browsers - // (IE first became compatible with IE9.) - // If this test fails on earlier browsers, then enable something like this, - // because the font size is set by the parent div. - // if (!window.getComputedStyle) { - // fontSize = label.parentElement.style.fontSize; - // } - for (var idx = 0; idx < labels.length; idx++) { - var label = labels[idx]; - var fontSize = window.getComputedStyle(label).fontSize; - assertEquals(sizePx, fontSize); - } - } // Be sure we're dealing with a 14-point default. assertEquals(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize); - assertSize("dygraph-axis-label-x", 14); - assertSize("dygraph-axis-label-y", 14); + var assertFontSize = function(selector, expected) { + Util.assertStyleOfChildren(selector, "font-size", expected); + } + + assertFontSize($(".dygraph-axis-label-x"), "14px"); + assertFontSize($(".dygraph-axis-label-y") , "14px"); g.updateOptions({ axisLabelFontSize : 8}); - assertSize("dygraph-axis-label-x", 8); - assertSize("dygraph-axis-label-y", 8); - -/* - Enable these tests when https://code.google.com/p/dygraphs/issues/detail?id=126 - is fixed. + assertFontSize($(".dygraph-axis-label-x"), "8px"); + assertFontSize($(".dygraph-axis-label-y"), "8px"); g.updateOptions({ axisLabelFontSize : null, - axes : { + axes : { x : { axisLabelFontSize : 5 }, - } - }); + } + }); - assertSize("dygraph-axis-label-x", 5); - assertSize("dygraph-axis-label-y", 14); + assertFontSize($(".dygraph-axis-label-x"), "5px"); + assertFontSize($(".dygraph-axis-label-y"), "14px"); g.updateOptions({ - axisLabelFontSize : null, - axes : { - y : { axisLabelFontSize : 3 }, - } - }); + axes : { + y : { axisLabelFontSize : 20 }, + } + }); - assertSize("dygraph-axis-label-x", 5); - assertSize("dygraph-axis-label-y", 3); + assertFontSize($(".dygraph-axis-label-x"), "5px"); + assertFontSize($(".dygraph-axis-label-y"), "20px"); g.updateOptions({ - series : { + series : { Y2 : { axis : "y2" } // copy y2 series to y2 axis. - }, - axes : { - y2 : { axisLabelFontSize : 8 }, - } - }); - - assertSize("dygraph-axis-label-x", 5); - assertSize("dygraph-axis-label-y", 3); - assertSize("dygraph-axis-label-y2", 8); -*/ + }, + axes : { + y2 : { axisLabelFontSize : 12 }, + } + }); + + assertFontSize($(".dygraph-axis-label-x"), "5px"); + assertFontSize($(".dygraph-axis-label-y1"), "20px"); + assertFontSize($(".dygraph-axis-label-y2"), "12px"); } AxisLabelsTestCase.prototype.testAxisLabelFontSizeNull = function() { @@ -644,9 +624,268 @@ AxisLabelsTestCase.prototype.testAxisLabelFontSizeNull = function() { axisLabelFontSize: null }); + var assertFontSize = function(selector, expected) { + Util.assertStyleOfChildren(selector, "font-size", expected); + }; + + // Be sure we're dealing with a 14-point default. + assertEquals(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize); + + assertFontSize($(".dygraph-axis-label-x"), "14px"); + assertFontSize($(".dygraph-axis-label-y"), "14px"); +} + +AxisLabelsTestCase.prototype.testAxisLabelColor = function() { + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, AxisLabelsTestCase.simpleData, {}); + + // Be sure we're dealing with a black default. + assertEquals("black", Dygraph.DEFAULT_ATTRS.axisLabelColor); + + var assertColor = function(selector, expected) { + Util.assertStyleOfChildren(selector, "color", expected); + } + + assertColor($(".dygraph-axis-label-x"), "rgb(0, 0, 0)"); + assertColor($(".dygraph-axis-label-y"), "rgb(0, 0, 0)"); + + g.updateOptions({ axisLabelColor : "red"}); + assertColor($(".dygraph-axis-label-x"), "rgb(255, 0, 0)"); + assertColor($(".dygraph-axis-label-y"), "rgb(255, 0, 0)"); + + g.updateOptions({ + axisLabelColor : null, + axes : { + x : { axisLabelColor : "blue" }, + } + }); + + assertColor($(".dygraph-axis-label-x"), "rgb(0, 0, 255)"); + assertColor($(".dygraph-axis-label-y"), "rgb(0, 0, 0)"); + + g.updateOptions({ + axes : { + y : { axisLabelColor : "green" }, + } + }); + + assertColor($(".dygraph-axis-label-x"), "rgb(0, 0, 255)"); + assertColor($(".dygraph-axis-label-y"), "rgb(0, 128, 0)"); + + g.updateOptions({ + series : { + Y2 : { axis : "y2" } // copy y2 series to y2 axis. + }, + axes : { + y2 : { axisLabelColor : "yellow" }, + } + }); + + assertColor($(".dygraph-axis-label-x"), "rgb(0, 0, 255)"); + assertColor($(".dygraph-axis-label-y1"), "rgb(0, 128, 0)"); + assertColor($(".dygraph-axis-label-y2"), "rgb(255, 255, 0)"); +} + +AxisLabelsTestCase.prototype.testAxisLabelColorNull = function() { + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, AxisLabelsTestCase.simpleData, + { + axisLabelColor: null + }); + + var assertColor = function(selector, expected) { + Util.assertStyleOfChildren(selector, "color", expected); + } + // Be sure we're dealing with a 14-point default. assertEquals(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize); - Util.assertFontSizes(graph, "dygraph-axis-label-x", 14); - Util.assertFontSizes(graph, "dygraph-axis-label-y", 14); + assertColor($(".dygraph-axis-label-x"), "rgb(0, 0, 0)"); + assertColor($(".dygraph-axis-label-y"), "rgb(0, 0, 0)"); } + +/* + * This test shows that the label formatter overrides labelsKMB for all values. + */ +AxisLabelsTestCase.prototype.testLabelFormatterOverridesLabelsKMB = function() { + var g = new Dygraph( + document.getElementById("graph"), + "X,a,b\n" + + "1,0,2000\n" + + "2,500,1500\n" + + "3,1000,1000\n" + + "4,2000,0\n", { + labelsKMB: true, + axisLabelFormatter: function (v) { + return v + ":X"; + } + }); + assertEquals(["0:X","500:X","1000:X","1500:X","2000:X"], Util.getYLabels()); + assertEquals(["1:X","1.5:X","2:X","2.5:X","3:X","3.5:X"], Util.getXLabels()); +} + +/* + * This test shows that you can override labelsKMB on the axis level. + */ +AxisLabelsTestCase.prototype.testLabelsKMBIgnoredWhenOverridden = function() { + var g = new Dygraph( + document.getElementById("graph"), + "x,a,b\n" + + "1,0,2000\n" + + "2,500,1500\n" + + "3,1000,1000\n" + + "4,2000,0\n", { + labelsKMB: true, + axes: { + y2: { + labelsKMB: false + } + }, + series: { + b: { + axis: "y2" + }, + } + }); + assertEquals(["0","500","1K","1.5K","2K"], Util.getYLabels(1)); + assertEquals(["0","500","1000","1500","2000"], Util.getYLabels(2)); +}; + +/* +// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=147 +// Checks that axis labels stay sane across a DST change. +AxisLabelsTestCase.prototype.testLabelsCrossDstChange = function() { + // (From tests/daylight-savings.html) + var g = new Dygraph( + document.getElementById("graph"), + "Date/Time,Purchases\n" + + "2010-11-05 00:00:00,167082\n" + + "2010-11-06 00:00:00,168571\n" + + "2010-11-07 00:00:00,177796\n" + + "2010-11-08 00:00:00,165587\n" + + "2010-11-09 00:00:00,164380\n", + { width: 1024 } + ); + + // Dates and "nice" hours: 6AM/PM and noon, not 5AM/11AM/... + var okLabels = { + '05Nov': true, + '06Nov': true, + '07Nov': true, + '08Nov': true, + '09Nov': true, + '06:00': true, + '12:00': true, + '18:00': true + }; + + var xLabels = Util.getXLabels(); + for (var i = 0; i < xLabels.length; i++) { + assertTrue(okLabels[xLabels[i]]); + } + + // This range had issues of its own on tests/daylight-savings.html. + g.updateOptions({ + dateWindow: [1289109997722.8127, 1289261208937.7659] + }); + xLabels = Util.getXLabels(); + for (var i = 0; i < xLabels.length; i++) { + assertTrue(okLabels[xLabels[i]]); + } +}; + + +// Tests data which crosses a "fall back" at a high enough frequency that you +// can see both 1:00 A.M.s. +AxisLabelsTestCase.prototype.testLabelsCrossDstChangeHighFreq = function() { + // Generate data which crosses the EST/EDT boundary. + var dst_data = []; + var base_ms = 1383454200000; + for (var x = base_ms; x < base_ms + 1000 * 60 * 80; x += 1000) { + dst_data.push([new Date(x), x]); + } + + var g = new Dygraph( + document.getElementById("graph"), + dst_data, + { width: 1024, labels: ['Date', 'Value'] } + ); + + assertEquals([ + '00:50', '00:55', + '01:00', '01:05', '01:10', '01:15', '01:20', '01:25', + '01:30', '01:35', '01:40', '01:45', '01:50', '01:55', + '01:00', '01:05' // 1 AM number two! + ], Util.getXLabels()); + + // Now zoom past the initial 1 AM. This used to cause trouble. + g.updateOptions({ + dateWindow: [1383454200000 + 15*60*1000, g.xAxisExtremes()[1]]} + ); + assertEquals([ + '01:05', '01:10', '01:15', '01:20', '01:25', + '01:30', '01:35', '01:40', '01:45', '01:50', '01:55', + '01:00', '01:05' // 1 AM number two! + ], Util.getXLabels()); +}; + + +// Tests data which crosses a "spring forward" at a low frequency. +// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=433 +AxisLabelsTestCase.prototype.testLabelsCrossSpringForward = function() { + var g = new Dygraph( + document.getElementById("graph"), + "Date/Time,Purchases\n" + + "2011-03-11 00:00:00,167082\n" + + "2011-03-12 00:00:00,168571\n" + + "2011-03-13 00:00:00,177796\n" + + "2011-03-14 00:00:00,165587\n" + + "2011-03-15 00:00:00,164380\n", + { + width: 1024, + dateWindow: [1299989043119.4365, 1300080693627.4866] + }); + + var okLabels = { + '13Mar': true, + // '02:00': true, // not a real time! + '04:00': true, + '06:00': true, + '08:00': true, + '10:00': true, + '12:00': true, + '14:00': true, + '16:00': true, + '18:00': true, + '20:00': true, + '22:00': true, + '14Mar': true + }; + + var xLabels = Util.getXLabels(); + for (var i = 0; i < xLabels.length; i++) { + assertTrue(okLabels[xLabels[i]]); + } +}; + +AxisLabelsTestCase.prototype.testLabelsCrossSpringForwardHighFreq = function() { + var base_ms_spring = 1299999000000; + var dst_data_spring = []; + for (var x = base_ms_spring; x < base_ms_spring + 1000 * 60 * 80; x += 1000) { + dst_data_spring.push([new Date(x), x]); + } + + var g = new Dygraph( + document.getElementById("graph"), + dst_data_spring, + { width: 1024, labels: ['Date', 'Value'] } + ); + + assertEquals([ + '01:50', '01:55', + '03:00', '03:05', '03:10', '03:15', '03:20', '03:25', + '03:30', '03:35', '03:40', '03:45', '03:50', '03:55', + '04:00', '04:05' + ], Util.getXLabels()); +}; +*/