Some more changes that came out of writing an article on mocks.

lib/unittest/operator_matchers.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.
 
 /**
  * This returns a matcher that inverts [matcher] to its logical negation.
  */
 Matcher isNot(matcher) => new _IsNot(wrapMatcher(matcher));
 
 class _IsNot extends BaseMatcher {
@@ skipping 28 matching lines @@
     expect(arg4, isNull);
     expect(arg5, isNull);
     expect(arg6, isNull);
     for (int i = 0; i < arg0.length; i++) {
       arg0[i] = wrapMatcher(arg0[i]);
     }
     return new _AllOf(arg0);
   } else {
     List matchers = new List();
     if (arg0 != null) {
-      matchers.add(arg0);
+      matchers.add(wrapMatcher(arg0));
     }
     if (arg1 != null) {
-      matchers.add(arg1);
+      matchers.add(wrapMatcher(arg1));
     }
     if (arg2 != null) {
-      matchers.add(arg2);
+      matchers.add(wrapMatcher(arg2));
     }
     if (arg3 != null) {
-      matchers.add(arg3);
+      matchers.add(wrapMatcher(arg3));
     }
     if (arg4 != null) {
-      matchers.add(arg4);
+      matchers.add(wrapMatcher(arg4));
     }
     if (arg5 != null) {
-      matchers.add(arg5);
+      matchers.add(wrapMatcher(arg5));
     }
     if (arg6 != null) {
-      matchers.add(arg6);
+      matchers.add(wrapMatcher(arg6));
     }
     return new _AllOf(matchers);
   }
 }
 
 class _AllOf extends BaseMatcher {
   final Iterable<Matcher> _matchers;
 
   const _AllOf(this._matchers);
 
@@ skipping 47 matching lines @@
     expect(arg4, isNull);
     expect(arg5, isNull);
     expect(arg6, isNull);
     for (int i = 0; i < arg0.length; i++) {
       arg0[i] = wrapMatcher(arg0[i]);
     }
     return new _AnyOf(arg0);
   } else {
     List matchers = new List();
     if (arg0 != null) {
-      matchers.add(arg0);
+      matchers.add(wrapMatcher(arg0));
     }
     if (arg1 != null) {
-      matchers.add(arg1);
+      matchers.add(wrapMatcher(arg1));
     }
     if (arg2 != null) {
-      matchers.add(arg2);
+      matchers.add(wrapMatcher(arg2));
     }
     if (arg3 != null) {
-      matchers.add(arg3);
+      matchers.add(wrapMatcher(arg3));
     }
     if (arg4 != null) {
-      matchers.add(arg4);
+      matchers.add(wrapMatcher(arg4));
     }
     if (arg5 != null) {
-      matchers.add(arg5);
+      matchers.add(wrapMatcher(arg5));
     }
     if (arg6 != null) {
-      matchers.add(arg6);
+      matchers.add(wrapMatcher(arg6));
     }
     return new _AnyOf(matchers);
   }
 }
 
 class _AnyOf extends BaseMatcher {
   final Iterable<Matcher> _matchers;
 
   const _AnyOf(this._matchers);
 
   bool matches(item) {
      for (var matcher in _matchers) {
        if (matcher.matches(item)) {
          return true;
        }
      }
      return false;
   }
 
   Description describe(Description description) =>
     description.addAll('(', ' or ', ')', _matchers);
 }