Some unit test fixes:

tests/lib/unittest/matchers_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.
 
-#library('unittestTest');
-
-#import('../../lib/unittest/unittest.dart');
-
+#library('matcherTest');
+#import('../../../lib/unittest/unittest.dart');
+#source('test_utils.dart');
 
 doesNotThrow() {}
 doesThrow() { throw 'X'; }
 
-int errorCount;
-String errorString;
-var testHandler;
-
-class MyFailureHandler extends DefaultFailureHandler {
-  void fail(String reason) {
-    ++errorCount;
-    errorString = reason;
-  }
-}
-
-void shouldFail(var value, Matcher matcher, expected) {
-  errorCount = 0;
-  errorString = '';
-  configureExpectHandler(testHandler);
-  expect(value, matcher);
-  configureExpectHandler(null);
-  expect(errorCount, equals(1));
-  if (expected is String)
-    expect(errorString, equalsIgnoringWhitespace(expected));
-  else
-   expect(errorString, expected);
-}
-
-void shouldPass(var value, Matcher matcher) {
-  errorCount = 0;
-  errorString = '';
-  configureExpectHandler(testHandler);
-  expect(value, matcher);
-  configureExpectHandler(null);
-  expect(errorCount, equals(0));
-}
-
 class PrefixMatcher extends BaseMatcher {
   final String _prefix;
   const PrefixMatcher(this._prefix);
   bool matches(item) {
     return item is String &&
         (collapseWhitespace(item)).startsWith(collapseWhitespace(_prefix));
   }
 
   Description describe(Description description) =>
     description.add('a string starting with ').
         addDescriptionOf(collapseWhitespace(_prefix)).
         add(' ignoring whitespace');
 }
 
 void main() {
 
-  testHandler = new MyFailureHandler();
+  initUtils();
 
   var a = new Map();
   var b = new Map();
   var c = new List();
 
   // Core matchers
 
   group('Core matchers', () {
     test('isTrue', () {
       shouldPass(true, isTrue);
@@ skipping 29 matching lines @@
       shouldPass(a, anything);
       shouldFail(a, isNot(anything), "Expected: not anything but: was <{}>");
     });
 
     test('throws', () {
       shouldFail(doesNotThrow, throws,
         "Expected: throws an exception but: no exception");
       shouldPass(doesThrow, throws);
     });
 
-    test('throwsA', () {
-      shouldPass(doesThrow, throwsA(equals('X')));
-      shouldFail(doesThrow, throwsA(equals('Y')),
-        "Expected: throws an exception which matches 'Y' "
-        "but:  exception does not match 'Y'");
-    });
-
     test('returnsNormally', () {
       shouldPass(doesNotThrow, returnsNormally);
       shouldFail(doesThrow, returnsNormally,
         "Expected: return normally but: threw exception");
     });
 
-    /* Removing these temporarily while dart2js failure is investigated */
-    /*
-    test('isInstanceOf', () {
-      shouldFail(0, new isInstanceOf<String>('String'),
-        "Expected: an instance of String but: was <0>");
-      shouldPass('cow', new isInstanceOf<String>('String'));
-    });
-    */
-
     test('hasLength', () {
       shouldPass(c, hasLength(0));
       shouldPass(a, hasLength(0));
       shouldPass('a', hasLength(1));
       shouldFail(0, hasLength(0), new PrefixMatcher(
         "Expected: an object with length of <0> "
         "but: was <0> has no length property"));
 
       c.add(0);
       shouldPass(c, hasLength(1));
@@ skipping 303 matching lines @@
     test('allOf', () {
       shouldPass(1, allOf([lessThan(10), greaterThan(0)]));
       shouldFail(-1, allOf([lessThan(10), greaterThan(0)]),
           "Expected: (a value less than <10> and a value greater than <0>) "
           "but: a value greater than <0> was <-1>");
     });
   });
 }