X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Futils_test.js;h=62b2c63c8b13ad4830fba1efab38973c54b728b0;hb=dbcf3e6d42b575e99702e39495f2c892526a705e;hp=9c8974c432b67cf7864e2b7b4916275acc6a7778;hpb=0e73b025c40afe6193dfc9ddb6ea6c640156d92e;p=dygraphs.git

diff --git a/auto_tests/tests/utils_test.js b/auto_tests/tests/utils_test.js
index 9c8974c..62b2c63 100644
--- a/auto_tests/tests/utils_test.js
+++ b/auto_tests/tests/utils_test.js
@@ -80,60 +80,60 @@ 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
@@ -148,25 +148,25 @@ UtilsTestCase.prototype.testIterator_whole_array = function() {
           return true;
         };
       });
-  assertTrue(iter.hasNext());
+  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());
 }
 
 UtilsTestCase.prototype.testIterator_no_args = function() {
   var array = ['a', 'b', 'c'];
   var iter = Dygraph.createIterator(array);
-  assertTrue(iter.hasNext());
+  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());
 }