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

lib/unittest/operator_matchers.dart

Index: lib/unittest/operator_matchers.dart
===================================================================
--- lib/unittest/operator_matchers.dart	(revision 9180)
+++ lib/unittest/operator_matchers.dart	(working copy)
@@ -46,25 +46,25 @@
   } 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);
   }
@@ -132,25 +132,25 @@
   } 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);
   }