CallMatchers can now be null, or take null for a method name. This might be

tests/lib/unittest/unittest_test.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.
 
 // TODO(gram):
 // Unfortunately I can't seem to test anything that involves timeouts, e.g.
 // insufficient callbacks, because the timeout is controlled externally
 // (test.dart?), and we would need to use a shorter timeout for the inner tests
 // so the outer timeout doesn't fire. So I removed all such tests.
 // I'd like to revisit this at some point.
@@ skipping 121 matching lines @@
       test(testName, () {
              var _callback;
              _callback = expectAsyncUntil0(() {
                if (++_testconfig.count < 10) {
                  _defer(_callback);
                }
              },
              () => (_testconfig.count == 10));
              _defer(_callback);
       });
-    } else if (testName == 'mock test 1 (Mock)') {
+    } else if (testName.startsWith('mock test 1 ')) {
       test(testName, () {
         var m = new Mock();
         print(m.length);
         m.getLogs(callsTo('get length')).verify(happenedOnce);
 
         m.when(callsTo('foo', 1, 2)).thenReturn('A').thenReturn('B');
         m.when(callsTo('foo', 1, 1)).thenReturn('C');
         m.when(callsTo('foo', 9, anything)).thenReturn('D');
         m.when(callsTo('bar', anything, anything)).thenReturn('E');
         m.when(callsTo('foobar')).thenReturn('F');
 
         var s = '${m.foo(1,2)}${m.foo(1,1)}${m.foo(9,10)}'
             '${m.bar(1,1)}${m.foo(1,2)}';
         m.getLogs(callsTo('foo', anything, anything)).
             verify(happenedExactly(4));
         m.getLogs(callsTo('foo', 1, anything)).verify(happenedExactly(3));
         m.getLogs(callsTo('foo', 9, anything)).verify(happenedOnce);
         m.getLogs(callsTo('foo', anything, 2)).verify(happenedExactly(2));
         m.getLogs(callsTo('foobar')).verify(neverHappened);
         m.getLogs(callsTo('foo', 10, anything)).verify(neverHappened);
         m.getLogs(callsTo('foo'), returning(anyOf('A', 'C'))).
               verify(happenedExactly(2));
         expect(s, 'ACDEB');
       });
-    } else if (testName == 'mock test 2 (MockList)') {
+    } else if (testName.startsWith('mock test 2 ')) {
       test(testName, () {
         var l = new MockList();
-        l.when(callsTo('length')).thenReturn(1);
+        l.when(callsTo('get length')).thenReturn(1);
         l.when(callsTo('add', anything)).alwaysReturn(0);
         l.add('foo');
-        expect(l.length(), 1);
+        expect(l.length, 1);
 
         var m = new MockList();
         m.when(callsTo('add', anything)).alwaysReturn(0);
 
         m.add('foo');
         m.add('bar');
 
         m.getLogs(callsTo('add')).verify(happenedExactly(2));
         m.getLogs(callsTo('add', 'foo')).verify(happenedOnce);
       });
-    } else if (testName == 'mock test 3 (Spy)') {
+    } else if (testName.startsWith('mock test 3 ')) {
       test(testName, () {
         var p = new FooSpy();
         p.sum(1, 2, 3);
         p.getLogs(callsTo('sum')).verify(happenedOnce);
         p.sum(2, 2, 2);
         p.getLogs(callsTo('sum')).verify(happenedExactly(2));
         p.getLogs(callsTo('sum')).verify(sometimeReturned(6));
         p.getLogs(callsTo('sum')).verify(alwaysReturned(6));
         p.getLogs(callsTo('sum')).verify(neverReturned(5));
         p.sum(2, 2, 1);
         p.getLogs(callsTo('sum')).verify(sometimeReturned(5));
       });
-    } else if (testName == 'mock test 4 (Excess calls)') {
+    } else if (testName.startsWith('mock test 4 ')) {
       test(testName, () {
         var m = new Mock();
         m.when(callsTo('foo')).alwaysReturn(null);
         m.foo();
         m.foo();
         m.getLogs(callsTo('foo')).verify(happenedOnce);
       });
-    } else if (testName == 'mock test 5 (No action)') {
+    } else if (testName.startsWith('mock test 5 ')) {
       test(testName, () {
         var m = new Mock();
         m.when(callsTo('foo')).thenReturn(null);
         m.foo();
         m.foo();
       });
-    } else if (testName == 'mock test 6 (No matching return)') {
+    } else if (testName.startsWith('mock test 6 ')) {
       test(testName, () {
         var p = new FooSpy();
         p.sum(1, 2, 3);
         p.getLogs(callsTo('sum')).verify(sometimeReturned(0));
       });
-    } else if (testName == 'mock test 7 (No behavior)') {
+    } else if (testName.startsWith('mock test 7 ')) {
       test(testName, () {
         var m = new Mock.custom(throwIfNoBehavior:true);
         m.when(callsTo('foo')).thenReturn(null);
         m.foo();
         m.bar();
       });
-    } else if (testName == 'mock test 8 (Shared log)') {
+    } else if (testName.startsWith('mock test 8 ')) {
       test(testName, () {
         var log = new LogEntryList();
         var m1 = new Mock.custom(name:'m1', log:log);
         var m2 = new Mock.custom(name:'m2', log:log);
         m1.foo();
         m2.foo();
         m1.bar();
         m2.bar();
         expect(log.logs.length, 4);
-        log.getMatches(null, callsTo('foo')).verify(happenedExactly(2));
+        log.getMatches(anything, callsTo('foo')).verify(happenedExactly(2));
         log.getMatches('m1', callsTo('foo')).verify(happenedOnce);
         log.getMatches('m1', callsTo('bar')).verify(happenedOnce);
         m2.getLogs(callsTo('foo')).verify(happenedOnce);
         m2.getLogs(callsTo('bar')).verify(happenedOnce);
       });
+    } else if (testName.startsWith('mock test 9 ')) {
+      test(testName, () {
+        var m = new Mock();
+        m.when(callsTo(null, 1)).alwaysReturn(2);
+        m.when(callsTo(null, 2)).alwaysReturn(4);
+        expect(m.foo(1), 2);
+        expect(m.foo(2), 4);
+        expect(m.bar(1), 2);
+        expect(m.bar(2), 4);
+        m.getLogs(callsTo()).verify(happenedExactly(4));
+        m.getLogs(callsTo(null, 1)).verify(happenedExactly(2));
+        m.getLogs(callsTo(null, 2)).verify(happenedExactly(2));
+        m.getLogs(null, returning(1)).verify(neverHappened);
+        m.getLogs(null, returning(2)).verify(happenedExactly(2));
+        m.getLogs(null, returning(4)).verify(happenedExactly(2));
+      });
+    } else if (testName.startsWith('mock test 10 ')) {
+      test(testName, () {
+        var m = new Mock();
+        m.when(callsTo(matches('^[A-Z]'))).
+            alwaysThrow('Method names must start with lower case');
+        m.test();
+      });
+    } else if (testName.startsWith('mock test 11 ')) {
+      test(testName, () {
+        var m = new Mock();
+        m.when(callsTo(matches('^[A-Z]'))).
+            alwaysThrow('Method names must start with lower case');
+        m.Test();
+      });
     }
   });
 }
 
 void nextTest(int testNum) {
   SendPort sport = spawnFunction(runTest);
   sport.call(tests[testNum]).then((msg) {
     actual.add(msg);
     if (actual.length == expected.length) {
       for (var i = 0; i < tests.length; i++) {
@@ skipping 17 matching lines @@
     'correct callback test',
     'excess callback test',
     'completion test',
     'mock test 1 (Mock)',
     'mock test 2 (MockList)',
     'mock test 3 (Spy)',
     'mock test 4 (Excess calls)',
     'mock test 5 (No action)',
     'mock test 6 (No matching return)',
     'mock test 7 (No behavior)',
-    'mock test 8 (Shared log)'
+    'mock test 8 (Shared log)',
+    'mock test 9 (Null CallMatcher)',
+    'mock test 10 (RegExp CallMatcher Good)',
+    'mock test 11 (RegExp CallMatcher Bad)'
   ];
 
   expected = [
     buildStatusString(1, 0, 0, tests[0]),
     buildStatusString(0, 1, 0, tests[1], message: 'Expected: <5> but: was <4>'),
     buildStatusString(0, 1, 0, tests[2], message: 'Caught Exception: fail'),
     buildStatusString(2, 0, 0, 'a a::a b b'),
     buildStatusString(1, 0, 0, 'a ${tests[4]}', 0, 'setup'),
     buildStatusString(1, 0, 0, 'a ${tests[5]}', 0, '', 'teardown'),
     buildStatusString(1, 0, 0, 'a ${tests[6]}', 0,
         'setup', 'teardown'),
     buildStatusString(1, 0, 0, tests[7], 1),
     buildStatusString(0, 0, 1, tests[8], 1,
         message: 'Callback called more times than expected (2 > 1)'),
     buildStatusString(1, 0, 0, tests[9], 10),
     buildStatusString(1, 0, 0, tests[10]),
     buildStatusString(1, 0, 0, tests[11]),
     buildStatusString(1, 0, 0, tests[12]),
     buildStatusString(0, 1, 0, tests[13],
-        message: 'Expected foo() to be called 1 times but:'
-            ' was called 2 times'),
+        message: "Expected <null>.'foo'() to be called 1 times but:"
+            " was called 2 times"),
     buildStatusString(0, 1, 0, tests[14],
         message: 'Caught Exception: No more actions for method foo'),
-    buildStatusString(0, 1, 0, tests[15],
-        message: 'Expected sum() to sometimes return <0> but: never did'),
+    buildStatusString(0, 1, 0, tests[15], message:
+        "Expected <null>.'sum'() to sometimes return <0> but: never did"),
     buildStatusString(0, 1, 0, tests[16],
         message: 'Caught Exception: No behavior specified for method bar'),
-    buildStatusString(1, 0, 0, tests[17])
+    buildStatusString(1, 0, 0, tests[17]),
+    buildStatusString(1, 0, 0, tests[18]),
+    buildStatusString(1, 0, 0, tests[19]),
+    buildStatusString(0, 1, 0, tests[20],
+        message:'Caught Method names must start with lower case')
   ];
 
   actual = [];
 
   nextTest(0);
 }