X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2Futils_test.js;h=7e60951f2542683018931783b58ba0359b5990e4;hb=08aa114abe7cd4e41b8bbef487a9b033f091a12a;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..7e60951 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. @@ -148,25 +148,41 @@ 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()); -} +}; + +/* +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()); +}; +*/