X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Frolling_average.js;h=c0af8f94c365d556a678d9e907dad68ec71c6933;hb=5d2acf298cb95cbcf42aaee980a516d13a961474;hp=2dd157f6204d71fe1cde577fd38796b423b6ca9d;hpb=77b5e09d8097138dfd4871db7a1240c787b916af;p=dygraphs.git

diff --git a/auto_tests/tests/rolling_average.js b/auto_tests/tests/rolling_average.js
index 2dd157f..c0af8f9 100644
--- a/auto_tests/tests/rolling_average.js
+++ b/auto_tests/tests/rolling_average.js
@@ -12,10 +12,6 @@ rollingAverageTestCase.prototype.setUp = function() {
 rollingAverageTestCase.prototype.tearDown = function() {
 };
 
-rollingAverageTestCase.prototype.getLegend = function() {
-  return document.getElementsByClassName("dygraph-legend")[0].textContent;
-};
-
 rollingAverageTestCase.prototype.testRollingAverage = function() {
   var opts = {
     width: 480,
@@ -33,31 +29,31 @@ rollingAverageTestCase.prototype.testRollingAverage = function() {
   var graph = document.getElementById("graph");
   var g = new Dygraph(graph, data, opts);
 
-  g.setSelection(0); assertEquals("0: Y:0", this.getLegend());
-  g.setSelection(1); assertEquals("1: Y:1", this.getLegend());
-  g.setSelection(2); assertEquals("2: Y:2", this.getLegend());
-  g.setSelection(3); assertEquals("3: Y:3", this.getLegend());
+  g.setSelection(0); assertEquals("0: Y: 0", Util.getLegend());
+  g.setSelection(1); assertEquals("1: Y: 1", Util.getLegend());
+  g.setSelection(2); assertEquals("2: Y: 2", Util.getLegend());
+  g.setSelection(3); assertEquals("3: Y: 3", Util.getLegend());
   assertEquals(1, g.rollPeriod());
 
   g.updateOptions({rollPeriod: 2});
-  g.setSelection(0); assertEquals("0: Y:0", this.getLegend());
-  g.setSelection(1); assertEquals("1: Y:0.5", this.getLegend());
-  g.setSelection(2); assertEquals("2: Y:1.5", this.getLegend());
-  g.setSelection(3); assertEquals("3: Y:2.5", this.getLegend());
+  g.setSelection(0); assertEquals("0: Y: 0", Util.getLegend());
+  g.setSelection(1); assertEquals("1: Y: 0.5", Util.getLegend());
+  g.setSelection(2); assertEquals("2: Y: 1.5", Util.getLegend());
+  g.setSelection(3); assertEquals("3: Y: 2.5", Util.getLegend());
   assertEquals(2, g.rollPeriod());
 
   g.updateOptions({rollPeriod: 3});
-  g.setSelection(0); assertEquals("0: Y:0", this.getLegend());
-  g.setSelection(1); assertEquals("1: Y:0.5", this.getLegend());
-  g.setSelection(2); assertEquals("2: Y:1", this.getLegend());
-  g.setSelection(3); assertEquals("3: Y:2", this.getLegend());
+  g.setSelection(0); assertEquals("0: Y: 0", Util.getLegend());
+  g.setSelection(1); assertEquals("1: Y: 0.5", Util.getLegend());
+  g.setSelection(2); assertEquals("2: Y: 1", Util.getLegend());
+  g.setSelection(3); assertEquals("3: Y: 2", Util.getLegend());
   assertEquals(3, g.rollPeriod());
 
   g.updateOptions({rollPeriod: 4});
-  g.setSelection(0); assertEquals("0: Y:0", this.getLegend());
-  g.setSelection(1); assertEquals("1: Y:0.5", this.getLegend());
-  g.setSelection(2); assertEquals("2: Y:1", this.getLegend());
-  g.setSelection(3); assertEquals("3: Y:1.5", this.getLegend());
+  g.setSelection(0); assertEquals("0: Y: 0", Util.getLegend());
+  g.setSelection(1); assertEquals("1: Y: 0.5", Util.getLegend());
+  g.setSelection(2); assertEquals("2: Y: 1", Util.getLegend());
+  g.setSelection(3); assertEquals("3: Y: 1.5", Util.getLegend());
   assertEquals(4, g.rollPeriod());
 };
 
@@ -85,3 +81,22 @@ rollingAverageTestCase.prototype.testRollBoxDoesntDisapper = function() {
   assertEquals("1", roll_box[0].value);
 };
 
+// Regression test for http://code.google.com/p/dygraphs/issues/detail?id=426
+rollingAverageTestCase.prototype.testRollShortFractions = function() {
+  var opts = {
+    customBars: true,
+    labels: ['x', 'A']
+  };
+  var data1 = [ [1, [1, 10, 20]] ];
+  var data2 = [ [1, [1, 10, 20]],
+                [2, [1, 20, 30]],
+              ];
+
+  var graph = document.getElementById("graph");
+  var g = new Dygraph(graph, data1, opts);
+
+  var rolled1 = g.rollingAverage(data1, 1);
+  var rolled2 = g.rollingAverage(data2, 1);
+
+  assertEquals(rolled1[0], rolled2[0]);
+};