Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1864)

Unified Diff: tests/corelib/queue_iterator_test.dart

Issue 11410086: Use iterator, moveNext(), current. (Closed) Base URL: https://dart.googlecode.com/svn/experimental/lib_v2/dart
Patch Set: Address comments. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tests/corelib/queue_iterator_test.dart
diff --git a/tests/corelib/queue_iterator_test.dart b/tests/corelib/queue_iterator_test.dart
index 4f9ffff019bd8dc3ed04403477fc4108154e7293..c3b495e3bd3e70102b77379bb415296d844ff0b4 100644
--- a/tests/corelib/queue_iterator_test.dart
+++ b/tests/corelib/queue_iterator_test.dart
@@ -10,20 +10,14 @@ class QueueIteratorTest {
}
static void testThrows(Iterator<int> it) {
- Expect.equals(false, it.hasNext);
- var exception = null;
- try {
- it.next();
- } on StateError catch (e) {
- exception = e;
- }
- Expect.equals(true, exception != null);
+ Expect.isFalse(it.moveNext());
+ Expect.throws(() => it.current, (e) => e is StateError);
}
static int sum(int expected, Iterator<int> it) {
int count = 0;
- while (it.hasNext) {
- count += it.next();
+ while (it.moveNext()) {
+ count += it.current;
}
Expect.equals(expected, count);
}
@@ -34,8 +28,7 @@ class QueueIteratorTest {
queue.addLast(2);
queue.addLast(3);
- Iterator<int> it = queue.iterator();
- Expect.equals(true, it.hasNext);
+ Iterator<int> it = queue.iterator;
sum(6, it);
testThrows(it);
}
@@ -47,16 +40,14 @@ class QueueIteratorTest {
count += i;
queue.addLast(i);
}
- Iterator<int> it = queue.iterator();
- Expect.equals(true, it.hasNext);
+ Iterator<int> it = queue.iterator;
sum(count, it);
testThrows(it);
}
static void testEmptyQueue() {
Queue<int> queue = new Queue<int>();
- Iterator<int> it = queue.iterator();
- Expect.equals(false, it.hasNext);
+ Iterator<int> it = queue.iterator;
sum(0, it);
testThrows(it);
}

Powered by Google App Engine
This is Rietveld 408576698