Comments

Author: srawlins

README.md

@@ -214,17 +214,17 @@ being passed into:
 ```dart
 when(cat.walk(
     typed/*<List<String>>*/(any),
-    gaits: typed/*<Map<String, String>>*/(any), name: 'gaits')).thenReturn(true);
+    gaits: typed/*<Map<String, String>>*/(any, named: 'gaits'))).thenReturn(true);
 ```
 
-Note the `name` argument. Mockito should fail gracefully if you forget to name a `typed`
+Note the `named` argument. Mockito should fail gracefully if you forget to name a `typed`
 call passed in as a named argument, or name the argument incorrectly.
 
 One more note about the `typed` API: you cannot mix `typed` arguments with `null`
 arguments:
 
 ```dart
-when(cat.eatFood(null, typed/*<List<String>>*/(any))).thenReturn(true) // Throws!
+when(cat.eatFood(null, typed/*<List<String>>*/(any))).thenReturn(true); // Throws!
 when(cat.eatFood(
     argThat(equals(null)),
     typed/*<List<String>>*/(any))).thenReturn(true); // Works.

lib/mockito.dart

@@ -55,10 +55,8 @@ class Mock {
 
 // Return a new [Invocation], reconstituted from [invocation], [_typedArgs],
 // and [_typedNamedArgs].
-Invocation _reconstituteInvocation(Invocation invocation) {
-  var newInvocation = new FakeInvocation(invocation);
-  return newInvocation;
-}
+Invocation _reconstituteInvocation(Invocation invocation) =>
+  new FakeInvocation(invocation);
 
 /// An Invocation implementation that allows all attributes to be passed into
 /// the constructor.
@@ -104,9 +102,9 @@ class FakeInvocation extends Invocation {
           // `when(obj.fn(a: typed(any)))`.
           throw new ArgumentError(
               'A typed argument was passed in as a named argument named "$name", '
-              'but did not a value for its name. Each typed argument that is '
-              'passed as a named argument needs to specify the `name` argument. '
-              'For example: `when(obj.fn(x: typed(any, name: "x")))`.');
+              'but did not pass a value for `named`. Each typed argument that is '
+              'passed as a named argument needs to specify the `named` argument. '
+              'For example: `when(obj.fn(x: typed(any, named: "x")))`.');
         }
       } else {
         // Add each real named argument that was _not_ passed with [typed].
@@ -118,16 +116,16 @@ class FakeInvocation extends Invocation {
       Symbol nameSymbol = new Symbol(name);
       if (!invocation.namedArguments.containsKey(nameSymbol)) {
         // Incorrect usage of [name], something like:
-        // `when(obj.fn(typed(any, name: 'a')))`.
+        // `when(obj.fn(typed(any, named: 'a')))`.
         throw new ArgumentError(
-            'A typed argument was declared with name $name, but was not passed '
+            'A typed argument was declared as named $name, but was not passed '
             'as an argument named $name.');
       }
       if (invocation.namedArguments[nameSymbol] != null) {
         // Incorrect usage of [name], something like:
-        // `when(obj.fn(a: typed(any, name: 'b'), b: "string"))`.
+        // `when(obj.fn(a: typed(any, named: 'b'), b: "string"))`.
         throw new ArgumentError(
-            'A typed argument was declared with name $name, but a different '
+            'A typed argument was declared as named $name, but a different '
             'value (${invocation.namedArguments[nameSymbol]}) was passed as '
             '$name.');
       }
@@ -422,11 +420,11 @@ get captureAny => new _ArgMatcher(anything, true);
 captureThat(Matcher matcher) => new _ArgMatcher(matcher, true);
 argThat(Matcher matcher) => new _ArgMatcher(matcher, false);
 
-/*=T*/ typed/*<T>*/(_ArgMatcher matcher, {String name}) {
-  if (name == null) {
+/*=T*/ typed/*<T>*/(_ArgMatcher matcher, {String named}) {
+  if (named == null) {
     _typedArgs.add(matcher);
   } else {
-    _typedNamedArgs[name] = matcher;
+    _typedNamedArgs[named] = matcher;
   }
   return null;
 }

test/mockito_test.dart

@@ -267,7 +267,7 @@ void main() {
     });
     test("should mock method with named, typed arg matcher", () {
       when(mock.methodWithSpecialNamedArgs(
-          typed/*<List<int>>*/(any), [43], y: typed/*<List<int>>*/(any, name: "y")))
+          typed/*<List<int>>*/(any), [43], y: typed/*<List<int>>*/(any, named: "y")))
           .thenReturn("A lot!");
       expect(mock.methodWithSpecialNamedArgs([42], [43], y: [44]), equals("A lot!"));
     });
@@ -276,7 +276,7 @@ void main() {
           mock.methodWithSpecialNamedArgs(
               typed/*<List<int>>*/(any),
               [43],
-              y: typed/*<List<int>>*/(any, name: "y"),
+              y: typed/*<List<int>>*/(any, named: "y"),
               z: argThat(contains(45))))
           .thenReturn("A lot!");
       expect(mock.methodWithSpecialNamedArgs([42], [43], y: [44], z: [45]),
@@ -287,25 +287,25 @@ void main() {
           mock.methodWithSpecialNamedArgs(
               typed/*<List<int>>*/(any),
               [43],
-              y: typed/*<List<int>>*/(any, name: "y"),
+              y: typed/*<List<int>>*/(any, named: "y"),
               z: [45]))
           .thenReturn("A lot!");
       expect(mock.methodWithSpecialNamedArgs([42], [43], y: [44], z: [45]),
           equals("A lot!"));
     });
-    test("should throw when [typed] used as a named arg, without `name:`", () {
+    test("should throw when [typed] used as a named arg, without `named:`", () {
       expect(() => when(mock.methodWithSpecialNamedArgs(
           typed/*<List<int>>*/(any), [43], y: typed/*<List<int>>*/(any))),
           throwsArgumentError);
     });
-    test("should throw when [typed] used as a positional arg, with `name:`", () {
+    test("should throw when [typed] used as a positional arg, with `named:`", () {
       expect(() => when(mock.methodWithSpecialNamedArgs(
-          typed/*<List<int>>*/(any), typed/*<List<int>>*/(any, name: "y"))),
+          typed/*<List<int>>*/(any), typed/*<List<int>>*/(any, named: "y"))),
           throwsArgumentError);
     });
-    test("should throw when [typed] used as a named arg, with the wrong `name:`", () {
+    test("should throw when [typed] used as a named arg, with the wrong `named:`", () {
       expect(() => when(mock.methodWithSpecialNamedArgs(
-          typed/*<List<int>>*/(any), [43], y: typed/*<List<int>>*/(any, name: "z"))),
+          typed/*<List<int>>*/(any), [43], y: typed/*<List<int>>*/(any, named: "z"))),
           throwsArgumentError);
     });
   });