X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Ferror_bars.js;h=4a1d10a12085b1049f6938361a638da5feeb01f9;hb=89fdcedbda6906d90e15d84285c4f6c0b8d96d28;hp=1e9d0f4526ff6a3ef8c0e4ca3ea4b9eb1fe10b29;hpb=e43d4d238ae016b477aee3f60f1707fb4effacd3;p=dygraphs.git

diff --git a/auto_tests/tests/error_bars.js b/auto_tests/tests/error_bars.js
index 1e9d0f4..4a1d10a 100644
--- a/auto_tests/tests/error_bars.js
+++ b/auto_tests/tests/error_bars.js
@@ -3,32 +3,38 @@
  *
  * @author danvk@google.com (Dan Vanderkam)
  */
-var errorBarsTestCase = TestCase("error-bars");
+describe("error-bars", function() {
 
-errorBarsTestCase.prototype.setUp = function() {
+beforeEach(function() {
   document.body.innerHTML = "<div id='graph'></div>";
-};
+});
 
-errorBarsTestCase._origFunc = Dygraph.getContext;
-errorBarsTestCase.prototype.setUp = function() {
+var _origFunc = Dygraph.getContext;
+beforeEach(function() {
   document.body.innerHTML = "<div id='graph'></div>";
   Dygraph.getContext = function(canvas) {
-    return new Proxy(errorBarsTestCase._origFunc(canvas));
+    return new Proxy(_origFunc(canvas));
   }
-};
+});
 
-errorBarsTestCase.prototype.tearDown = function() {
-  Dygraph.getContext = errorBarsTestCase._origFunc;
-};
+afterEach(function() {
+  Dygraph.getContext = _origFunc;
+});
 
-errorBarsTestCase.prototype.testErrorBarsDrawn = function() {
+it('testErrorBarsDrawn', function() {
   var opts = {
     width: 480,
     height: 320,
-    drawXGrid: false,
-    drawYGrid: false,
-    drawXAxis: false,
-    drawYAxis: false,
+    axes : {
+      x : {
+        drawGrid: false,
+        drawAxis: false,
+      },
+      y : {
+        drawGrid: false,
+        drawAxis: false,
+      }
+    },
     customBars: true,
     errorBars: true
   };
@@ -47,7 +53,7 @@ errorBarsTestCase.prototype.testErrorBarsDrawn = function() {
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
 
-  htx = g.hidden_ctx_;
+  var htx = g.hidden_ctx_;
 
   var attrs = {};  // TODO(danvk): fill in
 
@@ -88,9 +94,9 @@ errorBarsTestCase.prototype.testErrorBarsDrawn = function() {
   }
   g.destroy(); // Restore balanced saves and restores.
   CanvasAssertions.assertBalancedSaveRestore(htx);
-};
+});
 
-errorBarsTestCase.prototype.testErrorBarsCorrectColors = function() {
+it('testErrorBarsCorrectColors', function() {
   // Two constant series with constant error.
   var data = [
     [0, [100, 50], [200, 50]],
@@ -102,10 +108,16 @@ errorBarsTestCase.prototype.testErrorBarsCorrectColors = function() {
     sigma: 1.0,
     fillAlpha: 0.15,
     colors: ['#00ff00', '#0000ff'],
-    drawXGrid: false,
-    drawYGrid: false,
-    drawXAxis: false,
-    drawYAxis: false,
+    axes : {
+      x : {
+        drawGrid: false,
+        drawAxis: false,
+      },
+      y : {
+        drawGrid: false,
+        drawAxis: false,
+      }
+    },
     width: 400,
     height: 300,
     valueRange: [0, 300],
@@ -125,18 +137,18 @@ errorBarsTestCase.prototype.testErrorBarsCorrectColors = function() {
   // 249-299: empty (white)
   // TODO(danvk): test the edges of these regions.
 
-  assertEquals([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 75));
-  assertEquals([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 125));
-  assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 175));
-  assertEquals([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 225));
-};
+  assert.deepEqual([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 75));
+  assert.deepEqual([0, 0, 255, 38], Util.samplePixel(g.hidden_, 200, 125));
+  assert.deepEqual([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 175));
+  assert.deepEqual([0, 255, 0, 38], Util.samplePixel(g.hidden_, 200, 225));
+});
 
 
 // Regression test for http://code.google.com/p/dygraphs/issues/detail?id=392
-errorBarsTestCase.prototype.testRollingAveragePreservesNaNs = function() {
+it('testRollingAveragePreservesNaNs', function() {
   var graph = document.getElementById("graph");
-  var g = new Dygraph(graph,
-  [
+  var data = 
+    [
       [1, [null, null], [3,1]],
       [2, [2, 1], [null, null]],
       [3, [null, null], [5,1]],
@@ -145,8 +157,9 @@ errorBarsTestCase.prototype.testRollingAveragePreservesNaNs = function() {
       [6, [NaN, NaN], [null, null]],
       [8, [8, 1], [null, null]],
       [10, [10, 1], [null, null]]
-     ]
-        , {
+    ];
+  var g = new Dygraph(graph, data,
+        {
           labels: ['x', 'A', 'B' ],
           connectSeparatedPoints: true,
           drawPoints: true,
@@ -154,26 +167,22 @@ errorBarsTestCase.prototype.testRollingAveragePreservesNaNs = function() {
         }
       );
 
-  var in_series = [
-    [1, [null, null]],
-    [2, [2, 1]],
-    [3, [null, null]],
-    [4, [4, 0.5]],
-    [5, [null, null]],
-    [6, [NaN, NaN]],
-    [8, [8, 1]],
-    [10, [10, 1]]
-  ];
-  assertEquals(null, in_series[4][1][0]);
-  assertEquals(null, in_series[4][1][1]);
-  assertNaN(in_series[5][1][0]);
-  assertNaN(in_series[5][1][1]);
-
-  var out_series = g.rollingAverage(in_series, 1);
-  assertNaN(out_series[5][1][0]);
-  assertNaN(out_series[5][1][1]);
-  assertNaN(out_series[5][1][2]);
-  assertEquals(null, out_series[4][1][0]);
-  assertEquals(null, out_series[4][1][1]);
-  assertEquals(null, out_series[4][1][1]);
-};
+  var in_series = g.dataHandler_.extractSeries(data, 1, g.attributes_);
+
+  assert.equal(null, in_series[4][1]);
+  assert.equal(null, in_series[4][2][0]);
+  assert.equal(null, in_series[4][2][1]);
+  assert.isNaN(in_series[5][1]);
+  assert.isNaN(in_series[5][2][0]);
+  assert.isNaN(in_series[5][2][1]);
+
+  var out_series = g.dataHandler_.rollingAverage(in_series, 1, g.attributes_);
+  assert.isNaN(out_series[5][1]);
+  assert.isNaN(out_series[5][2][0]);
+  assert.isNaN(out_series[5][2][1]);
+  assert.equal(null, out_series[4][1]);
+  assert.equal(null, out_series[4][2][0]);
+  assert.equal(null, out_series[4][2][1]);
+});
+
+});