From 0fe209e5342738d306be0edc4bc1cd381fec5baf Mon Sep 17 00:00:00 2001 From: Robert Konigsberg Date: Thu, 22 Nov 2012 14:03:30 -0500 Subject: [PATCH] Add per-series tests that validate new-style options and how they relate to old-style options. --- auto_tests/tests/per_series.js | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/auto_tests/tests/per_series.js b/auto_tests/tests/per_series.js index 63fa8c2..a198a95 100644 --- a/auto_tests/tests/per_series.js +++ b/auto_tests/tests/per_series.js @@ -53,11 +53,51 @@ perSeriesTestCase.prototype.testOldStyleSeries = function() { pointSize : 5, Y: { pointSize : 4 }, }; + var graph = document.getElementById("graph"); + var data = "X,Y,Z\n1,0,0\n"; + g = new Dygraph(graph, data, opts); + + assertEquals(5, g.getOption("pointSize")); + assertEquals(4, g.getOption("pointSize", "Y")); + assertEquals(5, g.getOption("pointSize", "Z")); +}; + +perSeriesTestCase.prototype.testNewStyleSeries = function() { + var opts = { + pointSize : 5, + series : { + Y: { pointSize : 4 } + }, + }; + var graph = document.getElementById("graph"); + var data = "X,Y,Z\n1,0,0\n"; + g = new Dygraph(graph, data, opts); + + assertEquals(5, g.getOption("pointSize")); + assertEquals(4, g.getOption("pointSize", "Y")); + assertEquals(5, g.getOption("pointSize", "Z")); +}; + +perSeriesTestCase.prototype.testNewStyleSeriesTrumpsOldStyle = function() { + var opts = { + pointSize : 5, + Z : { pointSize : 6 }, + series : { + Y: { pointSize : 4 } + }, + }; + var graph = document.getElementById("graph"); var data = "X,Y,Z\n1,0,0\n"; - g = new Dygraph("Graph", data, opts); + g = new Dygraph(graph, data, opts); assertEquals(5, g.getOption("pointSize")); assertEquals(4, g.getOption("pointSize", "Y")); assertEquals(5, g.getOption("pointSize", "Z")); + + // 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")); }; -- 2.7.4