X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Futils_test.js;h=0aee0d5952a4e0322f1c98ac8a0a9dcb0f0bd175;hb=eec4fd0cb7dfc4dc661f00fca0c5ede94e8512a7;hp=ef022b9c4f5a8f4d2505c2a2f08445dd3d553711;hpb=7d1afbb93536f59e428f414d76514f25be4fffb6;p=dygraphs.git

diff --git a/auto_tests/tests/utils_test.js b/auto_tests/tests/utils_test.js
index ef022b9..0aee0d5 100644
--- a/auto_tests/tests/utils_test.js
+++ b/auto_tests/tests/utils_test.js
@@ -80,61 +80,61 @@ UtilsTestCase.prototype.testUpdateDeepDecoupled = function() {
 UtilsTestCase.prototype.testIterator_nopredicate = function() {
   var array = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
   var iter = Dygraph.createIterator(array, 1, 4);
-  assertTrue(iter.hasNext());
-  assertEquals('b', iter.peek());
+  assertTrue(iter.hasNext);
+  assertEquals('b', iter.peek);
   assertEquals('b', iter.next());
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
 
-  assertEquals('c', iter.peek());
+  assertEquals('c', iter.peek);
   assertEquals('c', iter.next());
 
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
   assertEquals('d', iter.next());
 
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
   assertEquals('e', iter.next());
 
-  assertFalse(iter.hasNext());
-}
+  assertFalse(iter.hasNext);
+};
 
 UtilsTestCase.prototype.testIterator_predicate = function() {
   var array = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
   var iter = Dygraph.createIterator(array, 1, 4,
       function(array, idx) { return array[idx] !== 'd' });
-  assertTrue(iter.hasNext());
-  assertEquals('b', iter.peek());
+  assertTrue(iter.hasNext);
+  assertEquals('b', iter.peek);
   assertEquals('b', iter.next());
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
 
-  assertEquals('c', iter.peek());
+  assertEquals('c', iter.peek);
   assertEquals('c', iter.next());
 
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
   assertEquals('e', iter.next());
 
-  assertFalse(iter.hasNext());
+  assertFalse(iter.hasNext);
 }
 
 UtilsTestCase.prototype.testIterator_empty = function() {
   var array = [];
   var iter = Dygraph.createIterator([], 0, 0);
-  assertFalse(iter.hasNext());
-}
+  assertFalse(iter.hasNext);
+};
 
 UtilsTestCase.prototype.testIterator_outOfRange = function() {
   var array = ['a', 'b', 'c'];
   var iter = Dygraph.createIterator(array, 1, 4,
       function(array, idx) { return array[idx] !== 'd' });
-  assertTrue(iter.hasNext());
-  assertEquals('b', iter.peek());
+  assertTrue(iter.hasNext);
+  assertEquals('b', iter.peek);
   assertEquals('b', iter.next());
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
 
-  assertEquals('c', iter.peek());
+  assertEquals('c', iter.peek);
   assertEquals('c', iter.next());
 
-  assertFalse(iter.hasNext());
-}
+  assertFalse(iter.hasNext);
+};
 
 // Makes sure full array is tested, and that the predicate isn't called
 // with invalid boundaries.
@@ -146,13 +146,49 @@ UtilsTestCase.prototype.testIterator_whole_array = function() {
           throw "err";
         } else {
           return true;
-        });
-  assertTrue(iter.hasNext());
+        };
+      });
+  assertTrue(iter.hasNext);
+  assertEquals('a', iter.next());
+  assertTrue(iter.hasNext);
+  assertEquals('b', iter.next());
+  assertTrue(iter.hasNext);
+  assertEquals('c', iter.next());
+  assertFalse(iter.hasNext);
+  assertNull(iter.next());
+};
+
+UtilsTestCase.prototype.testIterator_no_args = function() {
+  var array = ['a', 'b', 'c'];
+  var iter = Dygraph.createIterator(array);
+  assertTrue(iter.hasNext);
   assertEquals('a', iter.next());
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
   assertEquals('b', iter.next());
-  assertTrue(iter.hasNext());
+  assertTrue(iter.hasNext);
   assertEquals('c', iter.next());
-  assertFalse(iter.hasNext());
+  assertFalse(iter.hasNext);
   assertNull(iter.next());
-}
\ No newline at end of file
+};
+
+UtilsTestCase.prototype.testToRGB = function() {
+  assertEquals({r: 255, g: 200, b: 150}, Dygraph.toRGB_('rgb(255,200,150)'));
+  assertEquals({r: 255, g: 200, b: 150}, Dygraph.toRGB_('#FFC896'));
+  assertEquals({r: 255, g: 0, b: 0}, Dygraph.toRGB_('red'));
+};
+
+/*
+UtilsTestCase.prototype.testDateSet = function() {
+  var base = new Date(1383455100000);
+  var d = new Date(base);
+
+  // A one hour shift -- this is surprising behavior!
+  d.setMilliseconds(10);
+  assertEquals(3600010, d.getTime() - base.getTime());
+
+  // setDateSameTZ compensates for this surprise.
+  d = new Date(base);
+  Dygraph.setDateSameTZ(d, {ms: 10});
+  assertEquals(10, d.getTime() - base.getTime());
+};
+*/