Use iterator, moveNext(), current.

tests/corelib/list_iterators_test.dart

Index: tests/corelib/list_iterators_test.dart
diff --git a/tests/corelib/list_iterators_test.dart b/tests/corelib/list_iterators_test.dart
index 6f29061fb0fb28e9535daf5284e6e2c4c975cf45..b75bec477202925833444ecea2238494c1d30b95 100644
--- a/tests/corelib/list_iterators_test.dart
+++ b/tests/corelib/list_iterators_test.dart
@@ -4,20 +4,13 @@
 
 class ListIteratorsTest {
   static void checkListIterator(List a) {
-    Iterator it = a.iterator();
-    Expect.equals(false, it.hasNext == a.isEmpty);
+    Iterator it = a.iterator;
     for (int i = 0; i < a.length; i++) {
-      Expect.equals(true, it.hasNext);
-      var elem = it.next();
+      Expect.isTrue(it.moveNext());
+      var elem = it.current;

[Lasse Reichstein Nielsen, 2012/11/15 10:24:37]

I'd expect (pun intended) an "Expect.equals(a[i], elem)" here.

[floitsch, 2012/11/16 17:51:58]

Done.

     }
-    Expect.equals(false, it.hasNext);
-    bool exceptionCaught = false;
-    try {
-     var eleme = it.next();
-    } on StateError catch (e) {
-     exceptionCaught = true;
-    }
-    Expect.equals(true, exceptionCaught);
+    Expect.isFalse(it.moveNext());
+    Expect.throws(() { it.current; }, (e) => e is StateError);
   }
 
   static testMain() {
@@ -27,16 +20,19 @@ class ListIteratorsTest {
     checkListIterator(new List(10));
     checkListIterator(new List());
     List g = new List();
-    g.addAll([1, 2]);
+    g.addAll([1, 2, 3]);
     checkListIterator(g);
 
-    Iterator it = g.iterator();
-    Expect.equals(true, it.hasNext);
+    Iterator it = g.iterator;
+    Expect.isTrue(it.moveNext());
     g.removeLast();
-    Expect.equals(true, it.hasNext);
+    Expect.equals(1, it.current);
+    Expect.isTrue(it.moveNext());
     g.removeLast();
-    Expect.equals(false, it.hasNext);
+    Expect.throws(() => it.current);
+    Expect.isFalse(it.moveNext());
 
+    g.clear();
     g.addAll([10, 20]);
     int sum = 0;
     for (var elem in g) {