projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #565 from danvk/gulp
[dygraphs.git]
/
auto_tests
/
tests
/
axis_labels.js
diff --git
a/auto_tests/tests/axis_labels.js
b/auto_tests/tests/axis_labels.js
index
fd29235
..
89959ac
100644
(file)
--- a/
auto_tests/tests/axis_labels.js
+++ b/
auto_tests/tests/axis_labels.js
@@
-3,25
+3,25
@@
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
*
* @author dan@dygraphs.com (Dan Vanderkam)
*/
-var AxisLabelsTestCase = TestCase("axis-labels");
+describe("axis-labels", function() {
-
AxisLabelsTestCase.prototype.setUp =
function() {
+
beforeEach(
function() {
document.body.innerHTML = "<div id='graph'></div>";
document.body.innerHTML = "<div id='graph'></div>";
-};
+}
)
;
-
AxisLabelsTestCase.prototype.tearDown =
function() {
-};
+
afterEach(
function() {
+}
)
;
-
AxisLabelsTestCase.
simpleData =
+
var
simpleData =
"X,Y,Y2\n" +
"0,-1,.5\n" +
"1,0,.7\n" +
"2,1,.4\n" +
"3,0,.98\n";
"X,Y,Y2\n" +
"0,-1,.5\n" +
"1,0,.7\n" +
"2,1,.4\n" +
"3,0,.98\n";
-
AxisLabelsTestCase.prototype.
kCloseFloat = 1.0e-10;
+
var
kCloseFloat = 1.0e-10;
-
AxisLabelsTestCase.prototype.testMinusOneToOne =
function() {
+
it('testMinusOneToOne',
function() {
var opts = {
width: 480,
height: 320
var opts = {
width: 480,
height: 320
@@
-37,28
+37,28
@@
AxisLabelsTestCase.prototype.testMinusOneToOne = function() {
var g = new Dygraph(graph, data, opts);
// TODO(danvk): would ['-1.0','-0.5','0.0','0.5','1.0'] be better?
var g = new Dygraph(graph, data, opts);
// TODO(danvk): would ['-1.0','-0.5','0.0','0.5','1.0'] be better?
- assert
Equals
(['-1','-0.5','0','0.5','1'], Util.getYLabels());
+ assert
.deepEqual
(['-1','-0.5','0','0.5','1'], Util.getYLabels());
// Go up to 2
data += "4,2\n";
g.updateOptions({file: data});
// Go up to 2
data += "4,2\n";
g.updateOptions({file: data});
- assert
Equals
(['-1','-0.5','0','0.5','1','1.5','2'], Util.getYLabels());
+ assert
.deepEqual
(['-1','-0.5','0','0.5','1','1.5','2'], Util.getYLabels());
// Now 10
data += "5,10\n";
g.updateOptions({file: data});
// Now 10
data += "5,10\n";
g.updateOptions({file: data});
- assert
Equals
(['-2','0','2','4','6','8','10'], Util.getYLabels());
+ assert
.deepEqual
(['-2','0','2','4','6','8','10'], Util.getYLabels());
// Now 100
data += "6,100\n";
g.updateOptions({file: data});
// Now 100
data += "6,100\n";
g.updateOptions({file: data});
- assert
Equals
(['0','20','40','60','80','100'], Util.getYLabels());
+ assert
.deepEqual
(['0','20','40','60','80','100'], Util.getYLabels());
g.setSelection(0);
g.setSelection(0);
- assert
Equals
('0: Y: -1', Util.getLegend());
-};
+ assert
.equal
('0: Y: -1', Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testSmallRangeNearZero =
function() {
+
it('testSmallRangeNearZero',
function() {
var opts = {
drawAxesAtZero: true,
width: 480,
var opts = {
drawAxesAtZero: true,
width: 480,
@@
-74,24
+74,24
@@
AxisLabelsTestCase.prototype.testSmallRangeNearZero = function() {
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- assert
EqualsDelta
([-0.1,-0.05,0,0.05],
- Util.makeNumbers(Util.getYLabels()),
this.
kCloseFloat);
+ assert
DeepCloseTo
([-0.1,-0.05,0,0.05],
+ Util.makeNumbers(Util.getYLabels()), kCloseFloat);
opts.valueRange = [-0.05, 0.05];
g.updateOptions(opts);
opts.valueRange = [-0.05, 0.05];
g.updateOptions(opts);
- assert
Equals
([-0.04,-0.02,0,0.02,0.04],
- Util.makeNumbers(Util.getYLabels()));
+ assert
.deepEqual
([-0.04,-0.02,0,0.02,0.04],
+
Util.makeNumbers(Util.getYLabels()));
opts.valueRange = [-0.01, 0.01];
g.updateOptions(opts);
opts.valueRange = [-0.01, 0.01];
g.updateOptions(opts);
- assert
Equals
([-0.01,-0.005,0,0.005],
- Util.makeNumbers(Util.getYLabels()));
+ assert
.deepEqual
([-0.01,-0.005,0,0.005],
+
Util.makeNumbers(Util.getYLabels()));
g.setSelection(1);
g.setSelection(1);
- assert
Equals
('1: Y: 0', Util.getLegend());
-};
+ assert
.equal
('1: Y: 0', Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testSmallRangeAwayFromZero =
function() {
+
it('testSmallRangeAwayFromZero',
function() {
var opts = {
width: 480,
height: 320
var opts = {
width: 480,
height: 320
@@
-106,23
+106,23
@@
AxisLabelsTestCase.prototype.testSmallRangeAwayFromZero = function() {
opts.valueRange = [9.9, 10.1];
var g = new Dygraph(graph, data, opts);
opts.valueRange = [9.9, 10.1];
var g = new Dygraph(graph, data, opts);
- assert
Equals
(["9.9","9.92","9.94","9.96","9.98","10","10.02","10.04","10.06","10.08"], Util.getYLabels());
+ assert
.deepEqual
(["9.9","9.92","9.94","9.96","9.98","10","10.02","10.04","10.06","10.08"], Util.getYLabels());
opts.valueRange = [9.99, 10.01];
g.updateOptions(opts);
// TODO(danvk): this is bad
opts.valueRange = [9.99, 10.01];
g.updateOptions(opts);
// TODO(danvk): this is bad
- assert
Equals
(["9.99","9.99","9.99","10","10","10","10","10","10.01","10.01"], Util.getYLabels());
+ assert
.deepEqual
(["9.99","9.99","9.99","10","10","10","10","10","10.01","10.01"], Util.getYLabels());
opts.valueRange = [9.999, 10.001];
g.updateOptions(opts);
// TODO(danvk): this is even worse!
opts.valueRange = [9.999, 10.001];
g.updateOptions(opts);
// TODO(danvk): this is even worse!
- assert
Equals
(["10","10","10","10"], Util.getYLabels());
+ assert
.deepEqual
(["10","10","10","10"], Util.getYLabels());
g.setSelection(1);
g.setSelection(1);
- assert
Equals
('1: Y: 0', Util.getLegend());
-};
+ assert
.equal
('1: Y: 0', Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter =
function() {
+
it('testXAxisTimeLabelFormatter',
function() {
var opts = {
width: 480,
height: 320
var opts = {
width: 480,
height: 320
@@
-148,33
+148,33
@@
AxisLabelsTestCase.prototype.testXAxisTimeLabelFormatter = function() {
}
});
}
});
- assert
Equals
(["00:05:00","00:05:12","00:05:24","00:05:36","00:05:48"], Util.getXLabels());
+ assert
.deepEqual
(["00:05:00","00:05:12","00:05:24","00:05:36","00:05:48"], Util.getXLabels());
// The legend does not use the axisLabelFormatter:
g.setSelection(1);
// The legend does not use the axisLabelFormatter:
g.setSelection(1);
- assert
Equals
('5.1: Y1: 1', Util.getLegend());
-};
+ assert
.equal
('5.1: Y1: 1', Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testAxisLabelFormatter = function
() {
+
it('testAxisLabelFormatter', function
() {
var opts = {
width: 480,
height: 320,
axes : {
x : {
axisLabelFormatter : function(x, granularity, opts, dg) {
var opts = {
width: 480,
height: 320,
axes : {
x : {
axisLabelFormatter : function(x, granularity, opts, dg) {
- assert
Equals
('number', typeof(x));
- assert
Equals
('number', typeof(granularity));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('[Dygraph graph]', dg.toString());
+ assert
.equal
('number', typeof(x));
+ assert
.equal
('number', typeof(granularity));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('[Dygraph graph]', dg.toString());
return 'x' + x;
}
},
y : {
axisLabelFormatter : function(y, granularity, opts, dg) {
return 'x' + x;
}
},
y : {
axisLabelFormatter : function(y, granularity, opts, dg) {
- assert
Equals
('number', typeof(y));
- assert
Equals
('number', typeof(granularity));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('[Dygraph graph]', dg.toString());
+ assert
.equal
('number', typeof(y));
+ assert
.equal
('number', typeof(granularity));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('[Dygraph graph]', dg.toString());
return 'y' + y;
}
}
return 'y' + y;
}
}
@@
-188,14
+188,14
@@
AxisLabelsTestCase.prototype.testAxisLabelFormatter = function () {
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- assert
Equals
(['x0','x2','x4','x6','x8'], Util.getXLabels());
- assert
Equals
(["y0","y5","y10","y15"], Util.getYLabels());
+ assert
.deepEqual
(['x0','x2','x4','x6','x8'], Util.getXLabels());
+ assert
.deepEqual
(["y0","y5","y10","y15"], Util.getYLabels());
g.setSelection(2);
g.setSelection(2);
- assert
Equals
("2: y: 4", Util.getLegend());
-};
+ assert
.equal
("2: y: 4", Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function
() {
+
it('testDateAxisLabelFormatter', function
() {
var opts = {
width: 480,
height: 320,
var opts = {
width: 480,
height: 320,
@@
-203,19
+203,19
@@
AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () {
x : {
pixelsPerLabel: 60,
axisLabelFormatter : function(x, granularity, opts, dg) {
x : {
pixelsPerLabel: 60,
axisLabelFormatter : function(x, granularity, opts, dg) {
- assertTrue(Dygraph.isDateLike(x));
- assert
Equals
('number', typeof(granularity));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('[Dygraph graph]', dg.toString());
+ assert
.is
True(Dygraph.isDateLike(x));
+ assert
.equal
('number', typeof(granularity));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('[Dygraph graph]', dg.toString());
return 'x' + Util.formatDate(x);
}
},
y : {
axisLabelFormatter : function(y, granularity, opts, dg) {
return 'x' + Util.formatDate(x);
}
},
y : {
axisLabelFormatter : function(y, granularity, opts, dg) {
- assert
Equals
('number', typeof(y));
- assert
Equals
('number', typeof(granularity));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('[Dygraph graph]', dg.toString());
+ assert
.equal
('number', typeof(y));
+ assert
.equal
('number', typeof(granularity));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('[Dygraph graph]', dg.toString());
return 'y' + y;
}
}
return 'y' + y;
}
}
@@
-229,42
+229,42
@@
AxisLabelsTestCase.prototype.testDateAxisLabelFormatter = function () {
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- assert
Equals
(["x2011/01/02","x2011/01/04","x2011/01/06","x2011/01/08"], Util.getXLabels());
- assert
Equals
(["y5","y10","y15"], Util.getYLabels());
+ assert
.deepEqual
(["x2011/01/02","x2011/01/04","x2011/01/06","x2011/01/08"], Util.getXLabels());
+ assert
.deepEqual
(["y5","y10","y15"], Util.getYLabels());
g.setSelection(0);
g.setSelection(0);
- assert
Equals
("2011/01/01: y: 2", Util.getLegend());
-};
+ assert
.equal
("2011/01/01: y: 2", Util.getLegend());
+}
)
;
// This test verifies that when a valueFormatter is set (but not an
// axisLabelFormatter), then the valueFormatter is used to format the axis
// labels.
// This test verifies that when a valueFormatter is set (but not an
// axisLabelFormatter), then the valueFormatter is used to format the axis
// labels.
-
AxisLabelsTestCase.prototype.testValueFormatter = function
() {
+
it('testValueFormatter', function
() {
var opts = {
width: 480,
height: 320,
axes: {
x: {
valueFormatter: function(x, opts, series_name, dg, row, col) {
var opts = {
width: 480,
height: 320,
axes: {
x: {
valueFormatter: function(x, opts, series_name, dg, row, col) {
- assert
Equals
('number', typeof(x));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('string', typeof(series_name));
- assert
Equals
('[Dygraph graph]', dg.toString());
- assert
Equals
('number', typeof(row));
- assert
Equals
('number', typeof(col));
- assert
Equals
(dg, this);
+ assert
.equal
('number', typeof(x));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('string', typeof(series_name));
+ assert
.equal
('[Dygraph graph]', dg.toString());
+ assert
.equal
('number', typeof(row));
+ assert
.equal
('number', typeof(col));
+ assert
.equal
(dg, this);
return 'x' + x;
}
},
y: {
valueFormatter: function(y, opts, series_name, dg, row, col) {
return 'x' + x;
}
},
y: {
valueFormatter: function(y, opts, series_name, dg, row, col) {
- assert
Equals
('number', typeof(y));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('string', typeof(series_name));
- assert
Equals
('[Dygraph graph]', dg.toString());
- assert
Equals
('number', typeof(row));
- assert
Equals
('number', typeof(col));
- assert
Equals
(dg, this);
+ assert
.equal
('number', typeof(y));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('string', typeof(series_name));
+ assert
.equal
('[Dygraph graph]', dg.toString());
+ assert
.equal
('number', typeof(row));
+ assert
.equal
('number', typeof(col));
+ assert
.equal
(dg, this);
return 'y' + y;
}
}
return 'y' + y;
}
}
@@
-279,16
+279,16
@@
AxisLabelsTestCase.prototype.testValueFormatter = function () {
var g = new Dygraph(graph, data, opts);
// the valueFormatter options do not affect the ticks.
var g = new Dygraph(graph, data, opts);
// the valueFormatter options do not affect the ticks.
- assert
Equals
(['0','2','4','6','8'], Util.getXLabels());
- assert
Equals
(["0","5","10","15"],
+ assert
.deepEqual
(['0','2','4','6','8'], Util.getXLabels());
+ assert
.deepEqual
(["0","5","10","15"],
Util.getYLabels());
// they do affect the legend, however.
g.setSelection(2);
Util.getYLabels());
// they do affect the legend, however.
g.setSelection(2);
- assert
Equals
("x2: y: y4", Util.getLegend());
-};
+ assert
.equal
("x2: y: y4", Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testDateValueFormatter = function
() {
+
it('testDateValueFormatter', function
() {
var opts = {
width: 480,
height: 320,
var opts = {
width: 480,
height: 320,
@@
-296,25
+296,25
@@
AxisLabelsTestCase.prototype.testDateValueFormatter = function () {
x : {
pixelsPerLabel: 60,
valueFormatter: function(x, opts, series_name, dg, row, col) {
x : {
pixelsPerLabel: 60,
valueFormatter: function(x, opts, series_name, dg, row, col) {
- assert
Equals
('number', typeof(x));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('string', typeof(series_name));
- assert
Equals
('[Dygraph graph]', dg.toString());
- assert
Equals
('number', typeof(row));
- assert
Equals
('number', typeof(col));
- assert
Equals
(dg, this);
+ assert
.equal
('number', typeof(x));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('string', typeof(series_name));
+ assert
.equal
('[Dygraph graph]', dg.toString());
+ assert
.equal
('number', typeof(row));
+ assert
.equal
('number', typeof(col));
+ assert
.equal
(dg, this);
return 'x' + Util.formatDate(x);
}
},
y : {
valueFormatter: function(y, opts, series_name, dg, row, col) {
return 'x' + Util.formatDate(x);
}
},
y : {
valueFormatter: function(y, opts, series_name, dg, row, col) {
- assert
Equals
('number', typeof(y));
- assert
Equals
('function', typeof(opts));
- assert
Equals
('string', typeof(series_name));
- assert
Equals
('[Dygraph graph]', dg.toString());
- assert
Equals
('number', typeof(row));
- assert
Equals
('number', typeof(col));
- assert
Equals
(dg, this);
+ assert
.equal
('number', typeof(y));
+ assert
.equal
('function', typeof(opts));
+ assert
.equal
('string', typeof(series_name));
+ assert
.equal
('[Dygraph graph]', dg.toString());
+ assert
.equal
('number', typeof(row));
+ assert
.equal
('number', typeof(col));
+ assert
.equal
(dg, this);
return 'y' + y;
}
}
return 'y' + y;
}
}
@@
-330,38
+330,38
@@
AxisLabelsTestCase.prototype.testDateValueFormatter = function () {
var g = new Dygraph(graph, data, opts);
// valueFormatters do not affect ticks.
var g = new Dygraph(graph, data, opts);
// valueFormatters do not affect ticks.
- assert
Equals
(["02 Jan","04 Jan","06 Jan","08 Jan"], Util.getXLabels());
- assert
Equals
(["5","10","15"], Util.getYLabels());
+ assert
.deepEqual
(["02 Jan","04 Jan","06 Jan","08 Jan"], Util.getXLabels());
+ assert
.deepEqual
(["5","10","15"], Util.getYLabels());
// the valueFormatter options also affect the legend.
g.setSelection(2);
// the valueFormatter options also affect the legend.
g.setSelection(2);
- assert
Equals
('x2011/01/03: y: y6', Util.getLegend());
-};
+ assert
.equal
('x2011/01/03: y: y6', Util.getLegend());
+}
)
;
// This test verifies that when both a valueFormatter and an axisLabelFormatter
// are specified, the axisLabelFormatter takes precedence.
// This test verifies that when both a valueFormatter and an axisLabelFormatter
// are specified, the axisLabelFormatter takes precedence.
-
AxisLabelsTestCase.prototype.testAxisLabelFormatterPrecedence = function
() {
+
it('testAxisLabelFormatterPrecedence', function
() {
var opts = {
width: 480,
height: 320,
axes : {
x : {
valueFormatter: function(x) {
var opts = {
width: 480,
height: 320,
axes : {
x : {
valueFormatter: function(x) {
- assert
Equals
('[Dygraph graph]', this.toString());
+ assert
.equal
('[Dygraph graph]', this.toString());
return 'xvf' + x;
},
axisLabelFormatter: function(x, granularity) {
return 'xvf' + x;
},
axisLabelFormatter: function(x, granularity) {
- assert
Equals
('[Dygraph graph]', this.toString());
+ assert
.equal
('[Dygraph graph]', this.toString());
return 'x' + x;
}
},
y : {
valueFormatter: function(y) {
return 'x' + x;
}
},
y : {
valueFormatter: function(y) {
- assert
Equals
('[Dygraph graph]', this.toString());
+ assert
.equal
('[Dygraph graph]', this.toString());
return 'yvf' + y;
},
axisLabelFormatter: function(y) {
return 'yvf' + y;
},
axisLabelFormatter: function(y) {
- assert
Equals
('[Dygraph graph]', this.toString());
+ assert
.equal
('[Dygraph graph]', this.toString());
return 'y' + y;
}
}
return 'y' + y;
}
}
@@
-375,16
+375,16
@@
AxisLabelsTestCase.prototype.testAxisLabelFormatterPrecedence = function () {
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- assert
Equals
(['x0','x2','x4','x6','x8'], Util.getXLabels());
- assert
Equals
(["y0","y5","y10","y15"], Util.getYLabels());
+ assert
.deepEqual
(['x0','x2','x4','x6','x8'], Util.getXLabels());
+ assert
.deepEqual
(["y0","y5","y10","y15"], Util.getYLabels());
g.setSelection(9);
g.setSelection(9);
- assert
Equals
("xvf9: y: yvf18", Util.getLegend());
-};
+ assert
.equal
("xvf9: y: yvf18", Util.getLegend());
+}
)
;
// This is the same as the previous test, except that options are added
// one-by-one.
// This is the same as the previous test, except that options are added
// one-by-one.
-
AxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = function
() {
+
it('testAxisLabelFormatterIncremental', function
() {
var opts = {
width: 480,
height: 320,
var opts = {
width: 480,
height: 320,
@@
-433,24
+433,24
@@
AxisLabelsTestCase.prototype.testAxisLabelFormatterIncremental = function () {
}
});
}
});
- assert
Equals
(["x0","x2","x4","x6","x8"], Util.getXLabels());
- assert
Equals
(["y0","y5","y10","y15"], Util.getYLabels());
+ assert
.deepEqual
(["x0","x2","x4","x6","x8"], Util.getXLabels());
+ assert
.deepEqual
(["y0","y5","y10","y15"], Util.getYLabels());
g.setSelection(9);
g.setSelection(9);
- assert
Equals
("xvf9: y: yvf18", Util.getLegend());
-};
+ assert
.equal
("xvf9: y: yvf18", Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testGlobalFormatters =
function() {
+
it('testGlobalFormatters',
function() {
var opts = {
width: 480,
height: 320,
labels: ['x', 'y'],
valueFormatter: function(x) {
var opts = {
width: 480,
height: 320,
labels: ['x', 'y'],
valueFormatter: function(x) {
- assert
Equals
('[Dygraph graph]', this);
+ assert
.equal
('[Dygraph graph]', this);
return 'vf' + x;
},
axisLabelFormatter: function(x) {
return 'vf' + x;
},
axisLabelFormatter: function(x) {
- assert
Equals
('[Dygraph graph]', this);
+ assert
.equal
('[Dygraph graph]', this);
return 'alf' + x;
}
};
return 'alf' + x;
}
};
@@
-461,14
+461,14
@@
AxisLabelsTestCase.prototype.testGlobalFormatters = function() {
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
var graph = document.getElementById("graph");
var g = new Dygraph(graph, data, opts);
- assert
Equals
(['alf0','alf2','alf4','alf6','alf8'], Util.getXLabels());
- assert
Equals
(["alf0","alf5","alf10","alf15"], Util.getYLabels());
+ assert
.deepEqual
(['alf0','alf2','alf4','alf6','alf8'], Util.getXLabels());
+ assert
.deepEqual
(["alf0","alf5","alf10","alf15"], Util.getYLabels());
g.setSelection(9);
g.setSelection(9);
- assert
Equals
("vf9: y: vf18", Util.getLegend());
-};
+ assert
.equal
("vf9: y: vf18", Util.getLegend());
+}
)
;
-
AxisLabelsTestCase.prototype.testValueFormatterParameters =
function() {
+
it('testValueFormatterParameters',
function() {
var calls = [];
// change any functions in list to 'fn' -- functions can't be asserted.
var killFunctions = function(list) {
var calls = [];
// change any functions in list to 'fn' -- functions can't be asserted.
var killFunctions = function(list) {
@@
-507,9
+507,9
@@
AxisLabelsTestCase.prototype.testValueFormatterParameters = function() {
var graph = document.getElementById('graph');
var g = new Dygraph(graph, data, opts);
var graph = document.getElementById('graph');
var g = new Dygraph(graph, data, opts);
- assert
Equals
([], calls);
+ assert
.deepEqual
([], calls);
g.setSelection(0);
g.setSelection(0);
- assert
Equals
([
+ assert
.deepEqual
([
// num or millis, opts, series, dygraph, row, col
[ 'x', g, 0, 'fn', 'x', g, 0, 0],
[ 'y', g, 1, 'fn', 'y1', g, 0, 1],
// num or millis, opts, series, dygraph, row, col
[ 'x', g, 0, 'fn', 'x', g, 0, 0],
[ 'y', g, 1, 'fn', 'y1', g, 0, 1],
@@
-518,14
+518,14
@@
AxisLabelsTestCase.prototype.testValueFormatterParameters = function() {
calls = [];
g.setSelection(1);
calls = [];
g.setSelection(1);
- assert
Equals
([
+ assert
.deepEqual
([
[ 'x', g, 1, 'fn', 'x', g, 1, 0],
[ 'y', g, 3, 'fn', 'y1', g, 1, 1],
['y2', g, 4, 'fn', 'y2', g, 1, 2]
], calls);
[ 'x', g, 1, 'fn', 'x', g, 1, 0],
[ 'y', g, 3, 'fn', 'y1', g, 1, 1],
['y2', g, 4, 'fn', 'y2', g, 1, 2]
], calls);
-};
+}
)
;
-
AxisLabelsTestCase.prototype.testSeriesOrder =
function() {
+
it('testSeriesOrder',
function() {
var opts = {
width: 480,
height: 320
var opts = {
width: 480,
height: 320
@@
-541,18
+541,18
@@
AxisLabelsTestCase.prototype.testSeriesOrder = function() {
var g = new Dygraph(graph, data, opts);
g.setSelection(2);
var g = new Dygraph(graph, data, opts);
g.setSelection(2);
- assert
Equals
('2: 00: 103 01: 203 10: 303 11: 403', Util.getLegend());
+ assert
.equal
('2: 00: 103 01: 203 10: 303 11: 403', Util.getLegend());
// Sanity checks for indexFromSetName
// Sanity checks for indexFromSetName
- assert
Equals
(0, g.indexFromSetName("x"));
- assert
Equals
(1, g.indexFromSetName("00"));
- assert
Equals
(null, g.indexFromSetName("abcde"));
+ assert
.equal
(0, g.indexFromSetName("x"));
+ assert
.equal
(1, g.indexFromSetName("00"));
+ assert
.equal
(null, g.indexFromSetName("abcde"));
// Verify that we get the label list back in the right order
// Verify that we get the label list back in the right order
- assert
Equals
(["x", "00", "01", "10", "11"], g.getLabels());
-};
+ assert
.deepEqual
(["x", "00", "01", "10", "11"], g.getLabels());
+}
)
;
-
AxisLabelsTestCase.prototype.testLabelKMB =
function() {
+
it('testLabelKMB',
function() {
var data = [];
data.push([0,0]);
data.push([1,2000]);
var data = [];
data.push([0,0]);
data.push([1,2000]);
@@
-571,10
+571,10
@@
AxisLabelsTestCase.prototype.testLabelKMB = function() {
}
);
}
);
- assert
Equals
(["0", "500", "1K", "1.5K", "2K"], Util.getYLabels());
-};
+ assert
.deepEqual
(["0", "500", "1K", "1.5K", "2K"], Util.getYLabels());
+}
)
;
-
AxisLabelsTestCase.prototype.testLabelKMG2 =
function() {
+
it('testLabelKMG2',
function() {
var data = [];
data.push([0,0]);
data.push([1,2000]);
var data = [];
data.push([0,0]);
data.push([1,2000]);
@@
-593,14
+593,13
@@
AxisLabelsTestCase.prototype.testLabelKMG2 = function() {
}
);
}
);
- assertEquals(
- ["0","256","512","768","1k","1.25k","1.5k","1.75k","2k"],
- Util.getYLabels());
-};
+ assert.deepEqual(["0","256","512","768","1k","1.25k","1.5k","1.75k","2k"],
+ Util.getYLabels());
+});
// Same as testLabelKMG2 but specifies the option at the
// top of the option dictionary.
// Same as testLabelKMG2 but specifies the option at the
// top of the option dictionary.
-
AxisLabelsTestCase.prototype.testLabelKMG2_top =
function() {
+
it('testLabelKMG2_top',
function() {
var data = [];
data.push([0,0]);
data.push([1,2000]);
var data = [];
data.push([0,0]);
data.push([1,2000]);
@@
-615,51
+614,51
@@
AxisLabelsTestCase.prototype.testLabelKMG2_top = function() {
}
);
}
);
- assert
Equals
(
+ assert
.deepEqual
(
["0","256","512","768","1k","1.25k","1.5k","1.75k","2k"],
Util.getYLabels());
["0","256","512","768","1k","1.25k","1.5k","1.75k","2k"],
Util.getYLabels());
-};
+}
)
;
/**
* Verify that log scale axis range is properly specified.
*/
/**
* Verify that log scale axis range is properly specified.
*/
-
AxisLabelsTestCase.prototype.testLogScale =
function() {
+
it('testLogScale',
function() {
var g = new Dygraph("graph", [[0, 5], [1, 1000]], { logscale : true });
var nonEmptyLabels = Util.getYLabels().filter(function(x) { return x.length > 0; });
var g = new Dygraph("graph", [[0, 5], [1, 1000]], { logscale : true });
var nonEmptyLabels = Util.getYLabels().filter(function(x) { return x.length > 0; });
- assert
Equals
(["5","10","20","50","100","200","500","1000"], nonEmptyLabels);
+ assert
.deepEqual
(["5","10","20","50","100","200","500","1000"], nonEmptyLabels);
g.updateOptions({ logscale : false });
g.updateOptions({ logscale : false });
- assert
Equals
(['0','200','400','600','800','1000'], Util.getYLabels());
-}
+ assert
.deepEqual
(['0','200','400','600','800','1000'], Util.getYLabels());
+}
);
/**
* Verify that include zero range is properly specified.
*/
/**
* Verify that include zero range is properly specified.
*/
-
AxisLabelsTestCase.prototype.testIncludeZero =
function() {
+
it('testIncludeZero',
function() {
var g = new Dygraph("graph", [[0, 500], [1, 1000]], { includeZero : true });
var g = new Dygraph("graph", [[0, 500], [1, 1000]], { includeZero : true });
- assert
Equals
(['0','200','400','600','800','1000'], Util.getYLabels());
+ assert
.deepEqual
(['0','200','400','600','800','1000'], Util.getYLabels());
g.updateOptions({ includeZero : false });
g.updateOptions({ includeZero : false });
- assert
Equals
(['500','600','700','800','900','1000'], Util.getYLabels());
-}
+ assert
.deepEqual
(['500','600','700','800','900','1000'], Util.getYLabels());
+}
);
-
AxisLabelsTestCase.prototype.testAxisLabelFontSize =
function() {
+
it('testAxisLabelFontSize',
function() {
var graph = document.getElementById("graph");
var graph = document.getElementById("graph");
- var g = new Dygraph(graph,
AxisLabelsTestCase.
simpleData, {});
+ var g = new Dygraph(graph, simpleData, {});
// Be sure we're dealing with a 14-point default.
// Be sure we're dealing with a 14-point default.
- assert
Equals
(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
+ assert
.equal
(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
var assertFontSize = function(selector, expected) {
Util.assertStyleOfChildren(selector, "font-size", expected);
}
var assertFontSize = function(selector, expected) {
Util.assertStyleOfChildren(selector, "font-size", expected);
}
- assertFontSize(
$
(".dygraph-axis-label-x"), "14px");
- assertFontSize(
$
(".dygraph-axis-label-y") , "14px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-x"), "14px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-y") , "14px");
g.updateOptions({ axisLabelFontSize : 8});
g.updateOptions({ axisLabelFontSize : 8});
- assertFontSize(
$
(".dygraph-axis-label-x"), "8px");
- assertFontSize(
$
(".dygraph-axis-label-y"), "8px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-x"), "8px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-y"), "8px");
g.updateOptions({
axisLabelFontSize : null,
g.updateOptions({
axisLabelFontSize : null,
@@
-668,8
+667,8
@@
AxisLabelsTestCase.prototype.testAxisLabelFontSize = function() {
}
});
}
});
- assertFontSize(
$
(".dygraph-axis-label-x"), "5px");
- assertFontSize(
$
(".dygraph-axis-label-y"), "14px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-x"), "5px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-y"), "14px");
g.updateOptions({
axes : {
g.updateOptions({
axes : {
@@
-677,8
+676,8
@@
AxisLabelsTestCase.prototype.testAxisLabelFontSize = function() {
}
});
}
});
- assertFontSize(
$
(".dygraph-axis-label-x"), "5px");
- assertFontSize(
$
(".dygraph-axis-label-y"), "20px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-x"), "5px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-y"), "20px");
g.updateOptions({
series : {
g.updateOptions({
series : {
@@
-689,14
+688,14
@@
AxisLabelsTestCase.prototype.testAxisLabelFontSize = function() {
}
});
}
});
- assertFontSize(
$
(".dygraph-axis-label-x"), "5px");
- assertFontSize(
$
(".dygraph-axis-label-y1"), "20px");
- assertFontSize(
$
(".dygraph-axis-label-y2"), "12px");
-}
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-x"), "5px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-y1"), "20px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-y2"), "12px");
+}
);
-
AxisLabelsTestCase.prototype.testAxisLabelFontSizeNull =
function() {
+
it('testAxisLabelFontSizeNull',
function() {
var graph = document.getElementById("graph");
var graph = document.getElementById("graph");
- var g = new Dygraph(graph,
AxisLabelsTestCase.
simpleData,
+ var g = new Dygraph(graph, simpleData,
{
axisLabelFontSize: null
});
{
axisLabelFontSize: null
});
@@
-706,29
+705,29
@@
AxisLabelsTestCase.prototype.testAxisLabelFontSizeNull = function() {
};
// Be sure we're dealing with a 14-point default.
};
// Be sure we're dealing with a 14-point default.
- assert
Equals
(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
+ assert
.equal
(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
- assertFontSize(
$
(".dygraph-axis-label-x"), "14px");
- assertFontSize(
$
(".dygraph-axis-label-y"), "14px");
-}
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-x"), "14px");
+ assertFontSize(
document.querySelectorAll
(".dygraph-axis-label-y"), "14px");
+}
);
-
AxisLabelsTestCase.prototype.testAxisLabelColor =
function() {
+
it('testAxisLabelColor',
function() {
var graph = document.getElementById("graph");
var graph = document.getElementById("graph");
- var g = new Dygraph(graph,
AxisLabelsTestCase.
simpleData, {});
+ var g = new Dygraph(graph, simpleData, {});
// Be sure we're dealing with a black default.
// Be sure we're dealing with a black default.
- assert
Equals
("black", Dygraph.DEFAULT_ATTRS.axisLabelColor);
+ assert
.equal
("black", Dygraph.DEFAULT_ATTRS.axisLabelColor);
var assertColor = function(selector, expected) {
Util.assertStyleOfChildren(selector, "color", expected);
}
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)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-x"), "rgb(0, 0, 0)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
g.updateOptions({ axisLabelColor : "red"});
g.updateOptions({ axisLabelColor : "red"});
- assertColor(
$
(".dygraph-axis-label-x"), "rgb(255, 0, 0)");
- assertColor(
$
(".dygraph-axis-label-y"), "rgb(255, 0, 0)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-x"), "rgb(255, 0, 0)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-y"), "rgb(255, 0, 0)");
g.updateOptions({
axisLabelColor : null,
g.updateOptions({
axisLabelColor : null,
@@
-737,8
+736,8
@@
AxisLabelsTestCase.prototype.testAxisLabelColor = function() {
}
});
}
});
- assertColor(
$
(".dygraph-axis-label-x"), "rgb(0, 0, 255)");
- assertColor(
$
(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-x"), "rgb(0, 0, 255)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
g.updateOptions({
axes : {
g.updateOptions({
axes : {
@@
-746,8
+745,8
@@
AxisLabelsTestCase.prototype.testAxisLabelColor = function() {
}
});
}
});
- assertColor(
$
(".dygraph-axis-label-x"), "rgb(0, 0, 255)");
- assertColor(
$
(".dygraph-axis-label-y"), "rgb(0, 128, 0)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-x"), "rgb(0, 0, 255)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-y"), "rgb(0, 128, 0)");
g.updateOptions({
series : {
g.updateOptions({
series : {
@@
-758,14
+757,14
@@
AxisLabelsTestCase.prototype.testAxisLabelColor = function() {
}
});
}
});
- 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)");
-}
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-x"), "rgb(0, 0, 255)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-y1"), "rgb(0, 128, 0)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-y2"), "rgb(255, 255, 0)");
+}
);
-
AxisLabelsTestCase.prototype.testAxisLabelColorNull =
function() {
+
it('testAxisLabelColorNull',
function() {
var graph = document.getElementById("graph");
var graph = document.getElementById("graph");
- var g = new Dygraph(graph,
AxisLabelsTestCase.
simpleData,
+ var g = new Dygraph(graph, simpleData,
{
axisLabelColor: null
});
{
axisLabelColor: null
});
@@
-775,16
+774,16
@@
AxisLabelsTestCase.prototype.testAxisLabelColorNull = function() {
}
// Be sure we're dealing with a 14-point default.
}
// Be sure we're dealing with a 14-point default.
- assert
Equals
(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
+ assert
.equal
(14, Dygraph.DEFAULT_ATTRS.axisLabelFontSize);
- assertColor(
$
(".dygraph-axis-label-x"), "rgb(0, 0, 0)");
- assertColor(
$
(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
-}
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-x"), "rgb(0, 0, 0)");
+ assertColor(
document.querySelectorAll
(".dygraph-axis-label-y"), "rgb(0, 0, 0)");
+}
);
/*
* This test shows that the label formatter overrides labelsKMB for all values.
*/
/*
* This test shows that the label formatter overrides labelsKMB for all values.
*/
-
AxisLabelsTestCase.prototype.testLabelFormatterOverridesLabelsKMB =
function() {
+
it('testLabelFormatterOverridesLabelsKMB',
function() {
var g = new Dygraph(
document.getElementById("graph"),
"X,a,b\n" +
var g = new Dygraph(
document.getElementById("graph"),
"X,a,b\n" +
@@
-797,14
+796,14
@@
AxisLabelsTestCase.prototype.testLabelFormatterOverridesLabelsKMB = function() {
return v + ":X";
}
});
return v + ":X";
}
});
- assert
Equals
(["0:X","500:X","1000:X","1500:X","2000:X"], Util.getYLabels());
- assert
Equals
(["1:X","2:X","3:X"], Util.getXLabels());
-}
+ assert
.deepEqual
(["0:X","500:X","1000:X","1500:X","2000:X"], Util.getYLabels());
+ assert
.deepEqual
(["1:X","2:X","3:X"], Util.getXLabels());
+}
);
/*
* This test shows that you can override labelsKMB on the axis level.
*/
/*
* This test shows that you can override labelsKMB on the axis level.
*/
-
AxisLabelsTestCase.prototype.testLabelsKMBPerAxis =
function() {
+
it('testLabelsKMBPerAxis',
function() {
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
@@
-824,15
+823,15
@@
AxisLabelsTestCase.prototype.testLabelsKMBPerAxis = function() {
// labelsKMB doesn't apply to the x axis. This value should be different.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
// labelsKMB doesn't apply to the x axis. This value should be different.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
- assert
Equals
(["1000","2000","3000"], Util.getXLabels());
- assert
Equals(
["0","500","1000","1500","2000"], Util.getYLabels(1));
- assert
Equals
(["0","500","1K","1.5K","2K"], Util.getYLabels(2));
-};
+ assert
.deepEqual
(["1000","2000","3000"], Util.getXLabels());
+ assert
.deepEqual(
["0","500","1000","1500","2000"], Util.getYLabels(1));
+ assert
.deepEqual
(["0","500","1K","1.5K","2K"], Util.getYLabels(2));
+}
)
;
/*
* This test shows that you can override labelsKMG2 on the axis level.
*/
/*
* This test shows that you can override labelsKMG2 on the axis level.
*/
-
AxisLabelsTestCase.prototype.testLabelsKMBG2IPerAxis =
function() {
+
it('testLabelsKMBG2IPerAxis',
function() {
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
@@
-854,15
+853,15
@@
AxisLabelsTestCase.prototype.testLabelsKMBG2IPerAxis = function() {
// Plus I can't be sure they're doing the same thing as they're done in different
// bits of code.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
// Plus I can't be sure they're doing the same thing as they're done in different
// bits of code.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
- assert
Equals
(["1024","2048","3072"], Util.getXLabels());
- assert
Equals(
["0","500","1000","1500","2000"], Util.getYLabels(1));
- assert
Equals
(["0","500","1000","1.46k","1.95k"], Util.getYLabels(2));
-};
+ assert
.deepEqual
(["1024","2048","3072"], Util.getXLabels());
+ assert
.deepEqual(
["0","500","1000","1500","2000"], Util.getYLabels(1));
+ assert
.deepEqual
(["0","500","1000","1.46k","1.95k"], Util.getYLabels(2));
+}
)
;
/**
* This test shows you can override sigFigs on the axis level.
*/
/**
* This test shows you can override sigFigs on the axis level.
*/
-
AxisLabelsTestCase.prototype.testSigFigsPerAxis =
function() {
+
it('testSigFigsPerAxis',
function() {
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
@@
-882,15
+881,15
@@
AxisLabelsTestCase.prototype.testSigFigsPerAxis = function() {
});
// sigFigs doesn't apply to the x axis. This value should be different.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
});
// sigFigs doesn't apply to the x axis. This value should be different.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
- assert
Equals
(["1000","2000","3000"], Util.getXLabels());
- assert
Equals
(["0.0","5.0e+2","1.0e+3","1.5e+3","2.0e+3"], Util.getYLabels(1));
- assert
Equals
(["0.00000","500.000","1000.00","1500.00","2000.00"], Util.getYLabels(2));
-}
+ assert
.deepEqual
(["1000","2000","3000"], Util.getXLabels());
+ assert
.deepEqual
(["0.0","5.0e+2","1.0e+3","1.5e+3","2.0e+3"], Util.getYLabels(1));
+ assert
.deepEqual
(["0.00000","500.000","1000.00","1500.00","2000.00"], Util.getYLabels(2));
+}
);
/**
* This test shows you can override digitsAfterDecimal on the axis level.
*/
/**
* This test shows you can override digitsAfterDecimal on the axis level.
*/
-
AxisLabelsTestCase.prototype.testDigitsAfterDecimalPerAxis =
function() {
+
it('testDigitsAfterDecimalPerAxis',
function() {
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
@@
-906,40
+905,40
@@
AxisLabelsTestCase.prototype.testDigitsAfterDecimalPerAxis = function() {
});
g.updateOptions({ axes: { y: { digitsAfterDecimal: 3 }}});
});
g.updateOptions({ axes: { y: { digitsAfterDecimal: 3 }}});
- assert
Equals
(["0.001","0.002","0.002","0.003","0.003","0.004","0.004"], Util.getYLabels(1));
+ assert
.deepEqual
(["0.001","0.002","0.002","0.003","0.003","0.004","0.004"], Util.getYLabels(1));
g.updateOptions({ axes: { y: { digitsAfterDecimal: 4 }}});
g.updateOptions({ axes: { y: { digitsAfterDecimal: 4 }}});
- assert
Equals
(["0.001","0.0015","0.002","0.0025","0.003","0.0035","0.004"], Util.getYLabels(1));
+ assert
.deepEqual
(["0.001","0.0015","0.002","0.0025","0.003","0.0035","0.004"], Util.getYLabels(1));
g.updateOptions({ axes: { y: { digitsAfterDecimal: 5 }}});
g.updateOptions({ axes: { y: { digitsAfterDecimal: 5 }}});
- assert
Equals
(["0.001","0.0015","0.002","0.0025","0.003","0.0035","0.004"], Util.getYLabels(1));
+ assert
.deepEqual
(["0.001","0.0015","0.002","0.0025","0.003","0.0035","0.004"], Util.getYLabels(1));
g.updateOptions({ axes: { y: { digitsAfterDecimal: null }}});
g.updateOptions({ axes: { y: { digitsAfterDecimal: null }}});
- assert
Equals
(["1e-3","2e-3","2e-3","3e-3","3e-3","4e-3","4e-3"], Util.getYLabels(1));
+ assert
.deepEqual
(["1e-3","2e-3","2e-3","3e-3","3e-3","4e-3","4e-3"], Util.getYLabels(1));
g.updateOptions({ axes: { y2: { digitsAfterDecimal: 3 }}});
g.updateOptions({ axes: { y2: { digitsAfterDecimal: 3 }}});
- assert
Equals
(["0.005","0.006","0.006","0.007","0.007","0.008","0.008"], Util.getYLabels(2));
+ assert
.deepEqual
(["0.005","0.006","0.006","0.007","0.007","0.008","0.008"], Util.getYLabels(2));
g.updateOptions({ axes: { y2: { digitsAfterDecimal: 4 }}});
g.updateOptions({ axes: { y2: { digitsAfterDecimal: 4 }}});
- assert
Equals
(["0.005","0.0055","0.006","0.0065","0.007","0.0075","0.008"], Util.getYLabels(2));
+ assert
.deepEqual
(["0.005","0.0055","0.006","0.0065","0.007","0.0075","0.008"], Util.getYLabels(2));
g.updateOptions({ axes: { y2: { digitsAfterDecimal: 5 }}});
g.updateOptions({ axes: { y2: { digitsAfterDecimal: 5 }}});
- assert
Equals
(["0.005","0.0055","0.006","0.0065","0.007","0.0075","0.008"], Util.getYLabels(2));
+ assert
.deepEqual
(["0.005","0.0055","0.006","0.0065","0.007","0.0075","0.008"], Util.getYLabels(2));
g.updateOptions({ axes: { y2: { digitsAfterDecimal: null }}});
g.updateOptions({ axes: { y2: { digitsAfterDecimal: null }}});
- assert
Equals
(["5e-3","6e-3","6e-3","7e-3","7e-3","7e-3","8e-3"], Util.getYLabels(2));
+ assert
.deepEqual
(["5e-3","6e-3","6e-3","7e-3","7e-3","7e-3","8e-3"], Util.getYLabels(2));
// digitsAfterDecimal is ignored for the x-axis.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
g.updateOptions({ axes: { x: { digitsAfterDecimal: 3 }}});
// digitsAfterDecimal is ignored for the x-axis.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
g.updateOptions({ axes: { x: { digitsAfterDecimal: 3 }}});
- assert
Equals
(["0.006","0.007","0.008"], Util.getXLabels());
+ assert
.deepEqual
(["0.006","0.007","0.008"], Util.getXLabels());
g.updateOptions({ axes: { x: { digitsAfterDecimal: 4 }}});
g.updateOptions({ axes: { x: { digitsAfterDecimal: 4 }}});
- assert
Equals
(["0.006","0.007","0.008"], Util.getXLabels());
+ assert
.deepEqual
(["0.006","0.007","0.008"], Util.getXLabels());
g.updateOptions({ axes: { x: { digitsAfterDecimal: 5 }}});
g.updateOptions({ axes: { x: { digitsAfterDecimal: 5 }}});
- assert
Equals
(["0.006","0.007","0.008"], Util.getXLabels());
+ assert
.deepEqual
(["0.006","0.007","0.008"], Util.getXLabels());
g.updateOptions({ axes: { x: { digitsAfterDecimal: null }}});
g.updateOptions({ axes: { x: { digitsAfterDecimal: null }}});
- assert
Equals
(["0.006","0.007","0.008"], Util.getXLabels());
-}
+ assert
.deepEqual
(["0.006","0.007","0.008"], Util.getXLabels());
+}
);
/**
* This test shows you can override digitsAfterDecimal on the axis level.
*/
/**
* This test shows you can override digitsAfterDecimal on the axis level.
*/
-
AxisLabelsTestCase.prototype.testMaxNumberWidthPerAxis =
function() {
+
it('testMaxNumberWidthPerAxis',
function() {
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
var g = new Dygraph(
document.getElementById("graph"),
"x,a,b\n" +
@@
-954,33
+953,33
@@
AxisLabelsTestCase.prototype.testMaxNumberWidthPerAxis = function() {
});
g.updateOptions({ axes: { y: { maxNumberWidth: 4 }}});
});
g.updateOptions({ axes: { y: { maxNumberWidth: 4 }}});
- assert
Equals
(["1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4"] , Util.getYLabels(1));
+ assert
.deepEqual
(["1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4"] , Util.getYLabels(1));
g.updateOptions({ axes: { y: { maxNumberWidth: 5 }}});
g.updateOptions({ axes: { y: { maxNumberWidth: 5 }}});
- assert
Equals
(["12601","12601.5","12602","12602.5","12603","12603.5","12604"] , Util.getYLabels(1));
+ assert
.deepEqual
(["12601","12601.5","12602","12602.5","12603","12603.5","12604"] , Util.getYLabels(1));
g.updateOptions({ axes: { y: { maxNumberWidth: null }}});
g.updateOptions({ axes: { y: { maxNumberWidth: null }}});
- assert
Equals
(["1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4"] , Util.getYLabels(1));
+ assert
.deepEqual
(["1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4","1.26e+4"] , Util.getYLabels(1));
g.updateOptions({ axes: { y2: { maxNumberWidth: 4 }}});
g.updateOptions({ axes: { y2: { maxNumberWidth: 4 }}});
- assert
Equals
(["1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4"], Util.getYLabels(2));
+ assert
.deepEqual
(["1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4"], Util.getYLabels(2));
g.updateOptions({ axes: { y2: { maxNumberWidth: 5 }}});
g.updateOptions({ axes: { y2: { maxNumberWidth: 5 }}});
- assert
Equals
(["12801","12801.5","12802","12802.5","12803","12803.5","12804"], Util.getYLabels(2));
+ assert
.deepEqual
(["12801","12801.5","12802","12802.5","12803","12803.5","12804"], Util.getYLabels(2));
g.updateOptions({ axes: { y2: { maxNumberWidth: null }}});
g.updateOptions({ axes: { y2: { maxNumberWidth: null }}});
- assert
Equals
(["1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4"], Util.getYLabels(2));
+ assert
.deepEqual
(["1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4","1.28e+4"], Util.getYLabels(2));
// maxNumberWidth is ignored for the x-axis.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
g.updateOptions({ axes: { x: { maxNumberWidth: 4 }}});
// maxNumberWidth is ignored for the x-axis.
// BUG : https://code.google.com/p/dygraphs/issues/detail?id=488
g.updateOptions({ axes: { x: { maxNumberWidth: 4 }}});
- assert
Equals
(["12401","12402","12403"], Util.getXLabels());
+ assert
.deepEqual
(["12401","12402","12403"], Util.getXLabels());
g.updateOptions({ axes: { x: { maxNumberWidth: 5 }}});
g.updateOptions({ axes: { x: { maxNumberWidth: 5 }}});
- assert
Equals
(["12401","12402","12403"], Util.getXLabels());
+ assert
.deepEqual
(["12401","12402","12403"], Util.getXLabels());
g.updateOptions({ axes: { x: { maxNumberWidth: null }}});
g.updateOptions({ axes: { x: { maxNumberWidth: null }}});
- assert
Equals
(["12401","12402","12403"], Util.getXLabels());
-}
+ assert
.deepEqual
(["12401","12402","12403"], Util.getXLabels());
+}
);
/*
// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=147
// Checks that axis labels stay sane across a DST change.
/*
// 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() {
+
it('testLabelsCrossDstChange',
function() {
// (From tests/daylight-savings.html)
var g = new Dygraph(
document.getElementById("graph"),
// (From tests/daylight-savings.html)
var g = new Dygraph(
document.getElementById("graph"),
@@
-1007,7
+1006,7
@@
AxisLabelsTestCase.prototype.testLabelsCrossDstChange = function() {
var xLabels = Util.getXLabels();
for (var i = 0; i < xLabels.length; i++) {
var xLabels = Util.getXLabels();
for (var i = 0; i < xLabels.length; i++) {
- assertTrue(okLabels[xLabels[i]]);
+ assert
.is
True(okLabels[xLabels[i]]);
}
// This range had issues of its own on tests/daylight-savings.html.
}
// This range had issues of its own on tests/daylight-savings.html.
@@
-1016,14
+1015,14
@@
AxisLabelsTestCase.prototype.testLabelsCrossDstChange = function() {
});
xLabels = Util.getXLabels();
for (var i = 0; i < xLabels.length; i++) {
});
xLabels = Util.getXLabels();
for (var i = 0; i < xLabels.length; i++) {
- assertTrue(okLabels[xLabels[i]]);
+ assert
.is
True(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.
// 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() {
+
it('testLabelsCrossDstChangeHighFreq',
function() {
// Generate data which crosses the EST/EDT boundary.
var dst_data = [];
var base_ms = 1383454200000;
// Generate data which crosses the EST/EDT boundary.
var dst_data = [];
var base_ms = 1383454200000;
@@
-1037,7
+1036,7
@@
AxisLabelsTestCase.prototype.testLabelsCrossDstChangeHighFreq = function() {
{ width: 1024, labels: ['Date', 'Value'] }
);
{ width: 1024, labels: ['Date', 'Value'] }
);
- assert
Equals
([
+ assert
.deepEqual
([
'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',
'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',
@@
-1048,17
+1047,17
@@
AxisLabelsTestCase.prototype.testLabelsCrossDstChangeHighFreq = function() {
g.updateOptions({
dateWindow: [1383454200000 + 15*60*1000, g.xAxisExtremes()[1]]}
);
g.updateOptions({
dateWindow: [1383454200000 + 15*60*1000, g.xAxisExtremes()[1]]}
);
- assert
Equals
([
+ assert
.deepEqual
([
'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());
'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
// 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() {
+
it('testLabelsCrossSpringForward',
function() {
var g = new Dygraph(
document.getElementById("graph"),
"Date/Time,Purchases\n" +
var g = new Dygraph(
document.getElementById("graph"),
"Date/Time,Purchases\n" +
@@
-1090,11
+1089,11
@@
AxisLabelsTestCase.prototype.testLabelsCrossSpringForward = function() {
var xLabels = Util.getXLabels();
for (var i = 0; i < xLabels.length; i++) {
var xLabels = Util.getXLabels();
for (var i = 0; i < xLabels.length; i++) {
- assertTrue(okLabels[xLabels[i]]);
+ assert
.is
True(okLabels[xLabels[i]]);
}
}
-};
+}
)
;
-
AxisLabelsTestCase.prototype.testLabelsCrossSpringForwardHighFreq =
function() {
+
it('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) {
var base_ms_spring = 1299999000000;
var dst_data_spring = [];
for (var x = base_ms_spring; x < base_ms_spring + 1000 * 60 * 80; x += 1000) {
@@
-1107,11
+1106,13
@@
AxisLabelsTestCase.prototype.testLabelsCrossSpringForwardHighFreq = function() {
{ width: 1024, labels: ['Date', 'Value'] }
);
{ width: 1024, labels: ['Date', 'Value'] }
);
- assert
Equals
([
+ assert
.deepEqual
([
'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());
'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());
-};
+}
)
;
*/
*/
+
+});