New expectation functions plus convert old tests to use these.

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.
  *
  * To import this library, specify the relative path to 
  * lib/unittest/unittest.dart.
  *
  * ##Concepts##
  *
  *  * Tests: Tests are specified via the top-level function [test], they can be
  *    organized together using [group].
- *  * Checks: Test expectations can be specified via [expect] (see methods in
- *    [Expectation]), [expectThrow], or using assertions with the [Expect]
- *    class.
+ *  * Checks: Test expectations can be specified via [expect]
  *  * Configuration: The framework can be adapted by calling [configure] with a
  *    [Configuration].  Common configurations can be found in this package
  *    under: 'dom\_config.dart', 'html\_config.dart', and 'vm\_config.dart'.
  *
  * ##Examples##
  *
  * A trivial test:
  *
  *     #import('path-to-dart/lib/unittest/unitest.dart');
  *     main() {
@@ skipping 90 matching lines @@
  *           // indicate that the asynchronous callback was invoked.
  *           async.complete();
  *         }), 0);
  *       });
  *
  */
 #library('unittest');
 
 #import('dart:isolate');
 
+#source('collection_matchers.dart');
 #source('config.dart');
-#source('expectation.dart');
+#source('core_matchers.dart');
+#source('description.dart');
+#source('expect.dart');
+#source('interfaces.dart');
+#source('map_matchers.dart');
+#source('matcher.dart');
+#source('numeric_matchers.dart');
+#source('operator_matchers.dart');
+#source('string_matchers.dart');
 #source('test_case.dart');
 
 /** [Configuration] used by the unittest library. */
 Configuration _config = null;
 
 /** Set the [Configuration] used by the unittest library. */
 void configure(Configuration config) {
   _config = config;
 }
 
@@ skipping 32 matching lines @@
 int _state = _UNINITIALIZED;
 String _uncaughtErrorMessage = null;
 
 final _PASS  = 'pass';
 final _FAIL  = 'fail';
 final _ERROR = 'error';
 
 /** If set, then all other test cases will be ignored. */
 TestCase _soloTest;
 
-/** Creates an expectation for the given value. */
-Expectation expect(value) => new Expectation(value);
-
 /**
  * Evaluates the [function] and validates that it throws an exception. If
  * [callback] is provided, then it will be invoked with the thrown exception.
  * The callback may do any validation it wants. In addition, if it returns
  * `false`, that also indicates an expectation failure.
  */
 void expectThrow(function, [bool callback(exception)]) {
   bool threw = false;
   try {
     function();
@@ skipping 385 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();