Big merge from experimental to bleeding edge.

pkg/unittest/lib/mock.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * A simple mocking/spy library.
  *
  * To create a mock objects for some class T, create a new class using:
  *
  *     class MockT extends Mock implements T {};
@@ skipping 826 matching lines @@
     // keep track of how many matching entries we can still add in the
     // current segment (0 if we are doing doing following neighbors, until
     // we get our first key match).
     List scratch = null;
     int remainingCount = 0;
     if (isPreceding) {
       scratch = new List();
       remainingCount = logs.length;
     }
 
-    var keyIterator = keys.logs.iterator();
-    LogEntry keyEntry = keyIterator.next();
+    var keyIterator = keys.logs.iterator;
+    keyIterator.moveNext();
+    LogEntry keyEntry = keyIterator.current;
     MatchState matchState = new MatchState();
 
     for (LogEntry logEntry in logs) {
       // If we have a log entry match, copy the saved matches from the
       // scratch buffer into the return list, as well as the matching entry,
       // if appropriate, and reset the scratch buffer. Continue processing
       // from the next key entry.
       if (keyEntry == logEntry) {
         if (scratch != null) {
           int numToCopy = scratch.length;
           if (distance > 0 && distance < numToCopy) {
             numToCopy = distance;
           }
           for (var i = scratch.length - numToCopy; i < scratch.length; i++) {
             rtn.logs.add(scratch[i]);
           }
           scratch.clear();
         } else {
           remainingCount = distance > 0 ? distance : logs.length;
         }
         if (includeKeys) {
           rtn.logs.add(keyEntry);
         }
-        if (keyIterator.hasNext) {
-          keyEntry = keyIterator.next();
+        if (keyIterator.moveNext()) {
+          keyEntry = keyIterator.current;
         } else if (isPreceding) { // We're done.
           break;
         }
       } else if (remainingCount > 0 &&
                  mockNameFilter.matches(logEntry.mockName, matchState) &&
                  logFilter(logEntry)) {
         if (scratch != null) {
           scratch.add(logEntry);
         } else {
           rtn.logs.add(logEntry);
@@ skipping 569 matching lines @@
 
   /** Clear the behaviors for the Mock. */
   void resetBehavior() => _behaviors.clear();
 
   /** Clear the logs for the Mock. */
   void clearLogs() {
     if (log != null) {
       if (name == null) { // This log is not shared.
         log.logs.clear();
       } else { // This log may be shared.
-        log.logs = log.logs.filter((e) => e.mockName != name);
+        log.logs = log.logs.where((e) => e.mockName != name).toList();
       }
     }
   }
 
   /** Clear both logs and behavior. */
   void reset() {
     resetBehavior();
     clearLogs();
   }
 }