perSeriesTestCase.prototype.tearDown = function() {
};
-
perSeriesTestCase.prototype.testPerSeriesFill = function() {
var opts = {
width: 480,
drawYGrid: false,
drawXAxis: false,
drawYAxis: false,
- Y: { fillGraph: true },
+ series: {
+ Y: { fillGraph: true },
+ },
colors: [ '#FF0000', '#0000FF' ],
fillAlpha: 0.15
};
assertEquals([255,0,0,38], sampler.colorAtCoordinate(6.5, 0.5));
};
-perSeriesTestCase.prototype.testOldStyleSeries = function() {
+perSeriesTestCase.prototype.testNewStyleSeries = function() {
var opts = {
pointSize : 5,
- Y: { pointSize : 4 },
+ series : {
+ Y: { pointSize : 4 }
+ },
};
var graph = document.getElementById("graph");
var data = "X,Y,Z\n1,0,0\n";
assertEquals(5, g.getOption("pointSize", "Z"));
};
-perSeriesTestCase.prototype.testNewStyleSeries = function() {
+// TODO(konigsberg): move to multiple_axes.js
+perSeriesTestCase.prototype.testAxisInNewSeries = function() {
var opts = {
- pointSize : 5,
series : {
- Y: { pointSize : 4 }
- },
+ D : { axis : 'y2' },
+ C : { axis : 1 },
+ B : { axis : 0 },
+ E : { axis : 'y' }
+ }
};
var graph = document.getElementById("graph");
- var data = "X,Y,Z\n1,0,0\n";
+ var data = "X,A,B,C,D,E\n0,1,2,3,4,5\n";
g = new Dygraph(graph, data, opts);
- assertEquals(5, g.getOption("pointSize"));
- assertEquals(4, g.getOption("pointSize", "Y"));
- assertEquals(5, g.getOption("pointSize", "Z"));
+ assertEquals(["A", "B", "E"], g.attributes_.seriesForAxis(0));
+ assertEquals(["C", "D"], g.attributes_.seriesForAxis(1));
};
-perSeriesTestCase.prototype.testNewStyleSeriesTrumpsOldStyle = function() {
+// TODO(konigsberg): move to multiple_axes.js
+perSeriesTestCase.prototype.testAxisInNewSeries_withAxes = function() {
var opts = {
- pointSize : 5,
- Z : { pointSize : 6 },
series : {
- Y: { pointSize : 4 }
+ D : { axis : 'y2' },
+ C : { axis : 1 },
+ B : { axis : 0 },
+ E : { axis : 'y' }
},
+ axes : {
+ y : { pointSize : 7 },
+ y2 : { pointSize : 6 }
+ }
};
var graph = document.getElementById("graph");
- var data = "X,Y,Z\n1,0,0\n";
+ var data = "X,A,B,C,D,E\n0,1,2,3,4,5\n";
g = new Dygraph(graph, data, opts);
- assertEquals(5, g.getOption("pointSize"));
- assertEquals(4, g.getOption("pointSize", "Y"));
- assertEquals(5, g.getOption("pointSize", "Z"));
+ assertEquals(["A", "B", "E"], g.attributes_.seriesForAxis(0));
+ assertEquals(["C", "D"], g.attributes_.seriesForAxis(1));
- // Erase the series object, and Z will become visible again.
- g.updateOptions({ series : undefined });
- assertEquals(5, g.getOption("pointSize"));
- assertEquals(6, g.getOption("pointSize", "Z"));
- assertEquals(5, g.getOption("pointSize", "Y"));
+ assertEquals(1.5, g.getOption("pointSize"));
+ assertEquals(7, g.getOption("pointSize", "A"));
+ assertEquals(7, g.getOption("pointSize", "B"));
+ assertEquals(6, g.getOption("pointSize", "C"));
+ assertEquals(6, g.getOption("pointSize", "D"));
+ assertEquals(7, g.getOption("pointSize", "E"));
};
+// TODO(konigsberg): move to multiple_axes.js
+perSeriesTestCase.prototype.testOldAxisSpecInNewSeriesThrows = function() {
+ var opts = {
+ series : {
+ D : { axis : {} },
+ },
+ };
+ var graph = document.getElementById("graph");
+ var data = "X,A,B,C,D,E\n0,1,2,3,4,5\n";
+ var threw = false;
+ try {
+ new Dygraph(graph, data, opts);
+ } catch(e) {
+ threw = true;
+ }
+
+ assertTrue(threw);
+}
+
+perSeriesTestCase.prototype.testColorOption = function() {
+ var graph = document.getElementById("graph");
+ var data = "X,A,B,C\n0,1,2,3\n";
+ var g = new Dygraph(graph, data, {});
+ assertEquals(['rgb(64,128,0)', 'rgb(64,0,128)', 'rgb(0,128,128)'], g.getColors());
+ g.updateOptions({series : { B : { color : 'purple' }}});
+ assertEquals(['rgb(64,128,0)', 'purple', 'rgb(0,128,128)'], g.getColors());
+}