X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=auto_tests%2Ftests%2Fconnect_separated_points.js;h=2636b41e6bcb24f60f544bf6981fcd23c871b8f9;hb=a02a53659ac6e1a81fd1cad0c404104a17cd653b;hp=f668ebcaf63d05f9cf15ee1e0514eb090cb3aadd;hpb=b85358e2c7dc73ec1179feb17b9060e132fcdbec;p=dygraphs.git diff --git a/auto_tests/tests/connect_separated_points.js b/auto_tests/tests/connect_separated_points.js index f668ebc..2636b41 100644 --- a/auto_tests/tests/connect_separated_points.js +++ b/auto_tests/tests/connect_separated_points.js @@ -3,26 +3,26 @@ * * @author julian.eichstaedt@ch.sauter-bc.com (Fr. Sauter AG) */ -var ConnectSeparatedPointsTestCase = TestCase("connect-separated-points"); +describe("connect-separated-points", function() { -ConnectSeparatedPointsTestCase.prototype.setUp = function() { +beforeEach(function() { document.body.innerHTML = "
"; -}; +}); -ConnectSeparatedPointsTestCase.origFunc = Dygraph.getContext; +var origFunc = Dygraph.getContext; -ConnectSeparatedPointsTestCase.prototype.setUp = function() { +beforeEach(function() { document.body.innerHTML = ""; Dygraph.getContext = function(canvas) { - return new Proxy(ConnectSeparatedPointsTestCase.origFunc(canvas)); + return new Proxy(origFunc(canvas)); }; -}; +}); -ConnectSeparatedPointsTestCase.prototype.tearDown = function() { - Dygraph.getContext = ConnectSeparatedPointsTestCase.origFunc; -}; +afterEach(function() { + Dygraph.getContext = origFunc; +}); -ConnectSeparatedPointsTestCase.prototype.testEdgePointsSimple = function() { +it('testEdgePointsSimple', function() { var opts = { width: 480, height: 320, @@ -47,7 +47,7 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsSimple = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; var attrs = {}; @@ -84,9 +84,9 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsSimple = function() { // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly // even if the point is outside the visible range and only one series has a valid value for this point. CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); -}; +}); -ConnectSeparatedPointsTestCase.prototype.testEdgePointsCustomBars = function() { +it('testEdgePointsCustomBars', function() { var opts = { width: 480, height: 320, @@ -113,7 +113,7 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsCustomBars = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; var attrs = {}; @@ -213,9 +213,9 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsCustomBars = function() { // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly // even if the point is outside the visible range and only one series has a valid value for this point. CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); -}; +}); -ConnectSeparatedPointsTestCase.prototype.testEdgePointsErrorBars = function() { +it('testEdgePointsErrorBars', function() { var opts = { width: 480, height: 320, @@ -243,7 +243,7 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsErrorBars = function() { var graph = document.getElementById("graph"); var g = new Dygraph(graph, data, opts); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; var attrs = {}; @@ -350,35 +350,35 @@ ConnectSeparatedPointsTestCase.prototype.testEdgePointsErrorBars = function() { // Check if both points are connected at the right edge of the canvas and if the option "connectSeparatedPoints" works properly // even if the point is outside the visible range and only one series has a valid value for this point. CanvasAssertions.assertLineDrawn(htx, xy1, xy2, attrs); -}; +}); -ConnectSeparatedPointsTestCase.prototype.testConnectSeparatedPointsPerSeries = function() { +it('testConnectSeparatedPointsPerSeries', function() { var assertExpectedLinesDrawnPerSeries = function(htx, expectedSeries1, expectedSeries2, expectedSeries3) { var expected = [expectedSeries1, expectedSeries2, expectedSeries3]; var actual = [ CanvasAssertions.numLinesDrawn(htx, "#ff0000"), CanvasAssertions.numLinesDrawn(htx, "#00ff00"), CanvasAssertions.numLinesDrawn(htx, "#0000ff")]; - assertEquals(expected, actual); + assert.deepEqual(expected, actual); } var g = new Dygraph(document.getElementById("graph"), - [ - [1, 10, 10, 10], - [2, 15, 11, 12], - [3, null, null, 12], - [4, 20, 14, null], - [5, 15, null, 17], - [6, 18, null, null], - [7, 12, 14, null] - ], - { - labels: ["Date","Series1","Series2","Series3"], - connectSeparatedPoints: false, - colors: ["#ff0000", "#00ff00", "#0000ff"] - }); + [ + [1, 10, 10, 10], + [2, 15, 11, 12], + [3, null, null, 12], + [4, 20, 14, null], + [5, 15, null, 17], + [6, 18, null, null], + [7, 12, 14, null] + ], + { + labels: ["Date","Series1","Series2","Series3"], + connectSeparatedPoints: false, + colors: ["#ff0000", "#00ff00", "#0000ff"] + }); - htx = g.hidden_ctx_; + var htx = g.hidden_ctx_; assertExpectedLinesDrawnPerSeries(htx, 4, 1, 2); Proxy.reset(htx); @@ -405,4 +405,47 @@ ConnectSeparatedPointsTestCase.prototype.testConnectSeparatedPointsPerSeries = f } }); assertExpectedLinesDrawnPerSeries(htx, 4, 3, 3); -} +}); + +it('testNaNErrorBars', function() { + var data = [ + [0,[1,2,3]], + [1,[2,3,4]], + [2,[3,4,5]], + [3,[null,null,null]], + [4,[2,3,4]], + [5,[3,4,5]], + [6,[2,3,4]], + [7,[NaN,NaN,NaN]], + [8,[2,3,4]], + [9,[2,3,4]], + [10,[2,3,4]], + [11,[2,3,4]] + ]; + + var opts = { + labels: ["x", "y"], + colors: ["#ff0000"], + customBars: true, + connectSeparatedPoints: true + }; + + var graph = document.getElementById("graph"); + var g = new Dygraph(graph, data, opts); + + var htx = g.hidden_ctx_; + + var attrs = {}; + + // Line should be drawn across the null gap. + CanvasAssertions.assertLineDrawn(htx, + g.toDomCoords(data[2][0], data[2][1][1]), + g.toDomCoords(data[4][0], data[4][1][1]), + attrs); + + // No line across the NaN gap, and a single line (not two) + // across the null gap. + assert.equal(8, CanvasAssertions.numLinesDrawn(htx, '#ff0000')); +}); + +});