Refactor the pub tests.

lib/unittest/unittest.dart

 // Copyright (c) 2011, 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.
 
 /**
  * A library for writing dart unit tests.
  *
  * ##Concepts##
  *
  *  * Tests: Tests are specified via the top-level function [test], they can be
@@ skipping 267 matching lines @@
   int calls = 0;
   TestCase testCase;
   _SpreadArgsHelper(this.callback, this.expectedCalls) {
     Expect.isTrue(_currentTest < _tests.length);
     testCase = _tests[_currentTest];
     testCase.callbacks++;
   }
 
   invoke([arg0 = _sentinel, arg1 = _sentinel, arg2 = _sentinel,
           arg3 = _sentinel, arg4 = _sentinel]) {
-    return _guard(() {
+    return guard(() {
       if (!_incrementCall()) {
         return;
       } else if (arg0 == _sentinel) {
         return callback();
       } else if (arg1 == _sentinel) {
         return callback(arg0);
       } else if (arg2 == _sentinel) {
         return callback(arg0, arg1);
       } else if (arg3 == _sentinel) {
         return callback(arg0, arg1, arg2);
       } else if (arg4 == _sentinel) {
         return callback(arg0, arg1, arg2, arg3);
       } else {
         testCase.error(
            'unittest lib does not support callbacks with more than 4 arguments',
            '');
         _state = _UNCAUGHT_ERROR;
       }
     }, () { if (calls == expectedCalls) callbackDone(); });
   }
 
   invoke0() {
-    return _guard(
+    return guard(
         () => _incrementCall() ? callback() : null,
         () { if (calls == expectedCalls) callbackDone(); });
   }
 
   invoke1(arg1) {
-    return _guard(
+    return guard(
         () => _incrementCall() ? callback(arg1) : null,
         () { if (calls == expectedCalls) callbackDone(); });
   }
 
   invoke2(arg1, arg2) {
-    return _guard(
+    return guard(
         () => _incrementCall() ? callback(arg1, arg2) : null,
         () { if (calls == expectedCalls) callbackDone(); });
   }
 
   /** Returns false if we exceded the number of expected calls. */
   bool _incrementCall() {
     calls++;
     if (calls > expectedCalls) {
       testCase.error(
          'Callback called more times than expected ($expectedCalls)',
@@ skipping 127 matching lines @@
   _defer(() {
     assert (_currentTest == 0);
     _testRunner();
   });
 }
 
 /**
  * Run [tryBody] guarded in a try-catch block. If an exception is thrown, update
  * the [_currentTest] status accordingly.
  */
-_guard(tryBody, [finallyBody]) {
+guard(tryBody, [finallyBody]) {

[Bob Nystrom, 2012/05/10 20:15:10]

If we're going to make this public, we should give it a more distinct name. We
expect/hope lots of people will use unittest so we try to be careful about what
names it steps on.

Maybe testGuard()?

[nweiz, 2012/05/10 21:01:09]

I don't have any great ideas for this name. Maybe Siggi will.

   try {
     return tryBody();
   } catch (ExpectException e, var trace) {
     if (_state != _UNCAUGHT_ERROR) {
       _tests[_currentTest].fail(e.message,
           trace == null ? '' : trace.toString());
     }
   } catch (var e, var trace) {
     if (_state == _RUNNING_TEST) {
       // If a random exception is thrown from within a test, we consider that
@@ skipping 12 matching lines @@
 }
 
 /**
  * Runs a batch of tests, yielding whenever an asynchronous test starts
  * running. Tests will resume executing when such asynchronous test calls
  * [done] or if it fails with an exception.
  */
 _nextBatch() {
   while (_currentTest < _tests.length) {
     final testCase = _tests[_currentTest];
-    _guard(() {
+    guard(() {
       _callbacksCalled = 0;
       _state = _RUNNING_TEST;
 
       testCase.test();
 
       if (_state != _UNCAUGHT_ERROR) {
         if (testCase.callbacks == _callbacksCalled) {
           testCase.pass();
         }
       }
@@ skipping 52 matching lines @@
   }
   _config.onInit();
 
   // Immediately queue the suite up. It will run after a timeout (i.e. after
   // main() has returned).
   _defer(_runTests);
 }
 
 /** Signature for a test function. */
 typedef void TestFunction();