When we have excess callbacks, throw instead of calling error() so that we

pkg/unittest/test/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 90 matching lines @@
       group('a', () {
         setUp(() { _testconfig.setup = 'setup'; });
         tearDown(() { _testconfig.teardown = 'teardown'; });
         test(testName, () {});
       });
     } else if (testName == 'correct callback test') {
       test(testName,
         () =>_defer(expectAsync0((){ ++_testconfig.count;})));
     } else if (testName == 'excess callback test') {
       test(testName, () {
-        var _callback = expectAsync0(() => ++_testconfig.count);
-        _defer(_callback);
-        _defer(_callback);
+        var _callback0 = expectAsync0(() => ++_testconfig.count);
+        var _callback1 = expectAsync0(() => ++_testconfig.count);
+        var _callback2 = expectAsync0(() {
+          _callback1();
+          _callback1();
+          _callback0();
+        });
+        _defer(_callback2);
       });
     } else if (testName == 'completion test') {
       test(testName, () {
              var _callback;
              _callback = expectAsyncUntil0(() {
                if (++_testconfig.count < 10) {
                  _defer(_callback);
                }
              },
              () => (_testconfig.count == 10));
              _defer(_callback);
       });
     } else if (testName == 'async exception test') {
       test(testName, () {
         expectAsync0(() {});
         _defer(() => guardAsync(() { throw "error!"; }));
       });
     } else if (testName == 'late exception test') {
+      var f;
       test('testOne', () {
-        var f = expectAsync0(() {});
-        _defer(protectAsync0(() {
-          _defer(protectAsync0(() => fail('first failure')));
-          fail('second failure');
-        }));
+        f = expectAsync0(() {});
+        _defer(f);
       });
       test('testTwo', () {
-        _defer(expectAsync0(() {}));
+        _defer(expectAsync0(() { f(); }));
       });
     } else if (testName == 'middle exception test') {
       test('testOne', () { expect(true, isTrue); });
       test('testTwo', () { expect(true, isFalse); });
       test('testThree', () {
         var done = expectAsync0((){});
         _defer(() {
           expect(true, isTrue);
           done();
         });
@@ skipping 138 matching lines @@
         });
       });
       test('error1', () {
         var callback = expectAsync0((){});
         var excesscallback = expectAsync0((){});
         return _defer(() {
           Timer.run(() {
             guardAsync(() {
               excesscallback();
               excesscallback();
-              excesscallback();
               callback();
             });
           });
         });
       });
       test("fail2", () {
         var callback = expectAsync0((){});
         return _defer(() {
           Timer.run(() {
             guardAsync(() {
               fail('failure');
               callback();
             });
           });
         });
       });
       test('error2', () {
         var callback = expectAsync0((){});
         var excesscallback = expectAsync0((){});
         return _defer(() {
           Timer.run(() {
             guardAsync(() {
               excesscallback();
               excesscallback();
+              excesscallback();
               callback();
             });
           });
         });
       });
       test('foo6', () {
       });
     }
   });
 }
@@ skipping 37 matching lines @@
     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]}', count: 0, setup: 'setup'),
     buildStatusString(1, 0, 0, 'a ${tests[5]}', count: 0, setup: '',
         teardown: 'teardown'),
     buildStatusString(1, 0, 0, 'a ${tests[6]}', count: 0,
         setup: 'setup', teardown: 'teardown'),
     buildStatusString(1, 0, 0, tests[7], count: 1),
-    buildStatusString(0, 0, 1, tests[8], count: 1,
-        message: 'Callback called more times than expected (2 > 1).'),
+    buildStatusString(0, 1, 0, tests[8], count: 1,
+        message: 'Callback called more times than expected (1).'),
     buildStatusString(1, 0, 0, tests[9], count: 10),
     buildStatusString(0, 1, 0, tests[10], message: 'Caught error!'),
     buildStatusString(1, 0, 1, 'testOne',
-        message: 'Callback called after already being marked as done '
-                 '(1).:testTwo:'),
+        message: 'Callback called after test case testOne has already '
+                 'been marked as done.:testTwo:'),
     buildStatusString(2, 1, 0,
         'testOne::testTwo:Expected: false but: was <true>.:testThree'),
     buildStatusString(2, 0, 3, 
         'good setup/good teardown foo1::'
         'good setup/bad teardown foo2:good setup/bad teardown '
         'foo2: Test teardown failed: Failed to complete tearDown:'
         'bad setup/good teardown foo3:bad setup/good teardown '
         'foo3: Test setup failed: Failed to complete setUp:'
         'bad setup/bad teardown foo4:bad setup/bad teardown '
         'foo4: Test teardown failed: Failed to complete tearDown:'
         'post groups'),
-    buildStatusString(2, 2, 2,
+    buildStatusString(2, 4, 0,
         'successful::'
-        'error1:Callback called more times than expected (3 > 1).:'
+        'error1:Callback called more times than expected (1).:'
         'fail1:Expected: <false> but: was <true>.:'
-        'error2:Callback called more times than expected (2 > 1).:'
+        'error2:Callback called more times than expected (1).:'
         'fail2:failure:'
         'foo5'),
-    buildStatusString(2, 2, 2,
+    buildStatusString(2, 4, 0,
         'successful::'
         'fail1:Expected: <false> but: was <true>.:'
-        'error1:Callback called more times than expected (3 > 1).:'
+        'error1:Callback called more times than expected (1).:'
         'fail2:failure:'
-        'error2:Callback called more times than expected (2 > 1).:'
+        'error2:Callback called more times than expected (1).:'
         'foo6'),
   ];
 
   actual = [];
 
   nextTest(0);
 }