Fix unittest for dart2js.

pkg/unittest/test/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 unittestTests;
 import 'package:unittest/unittest.dart';
 import 'dart:async';
 import 'dart:collection';
 part 'test_utils.dart';
 
@@ skipping 109 matching lines @@
     test('anything', () {
       var a = new Map();
       shouldPass(0, anything);
       shouldPass(null, anything);
       shouldPass(a, anything);
       shouldFail(a, isNot(anything), "Expected: not anything But: was {}.");
     });
 
     test('throws', () {
       shouldFail(doesNotThrow, throws,
-          "Expected: throws an exception But: no exception. "
-          "Actual: <Closure: (dynamic) => dynamic "
-              "from Function 'doesNotThrow': static.>");
+          matches(
+              r"Expected: throws an exception +But:  no exception\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic "
+                  r"from Function 'doesNotThrow': static\.)?>"));
       shouldPass(doesThrow, throws);
       shouldFail(true, throws,
           "Expected: throws an exception But: not a Function or Future. "
           "Actual: <true>");
     });
 
     test('throwsA', () {
       shouldPass(doesThrow, throwsA(equals('X')));
       shouldFail(doesThrow, throwsA(equals('Y')),
-          "Expected: throws an exception which matches 'Y' "
-          "But:  exception 'X' does not match 'Y'. "
-          "Actual: <Closure: (dynamic) => dynamic "
-              "from Function 'doesThrow': static.>");
+          matches(
+              r"Expected: throws an exception which matches 'Y' +"
+              r"But:  exception 'X' does not match 'Y'\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic "
+                  r"from Function 'doesThrow': static\.)?>"));
     });
 
     test('throwsFormatException', () {
       shouldPass(() { throw new FormatException(''); },
           throwsFormatException);
       shouldFail(() { throw new Exception(); },
           throwsFormatException,
-          "Expected: throws an exception which matches FormatException "
-          "But:  exception ?:<Exception> does not match FormatException. "
-          "Actual: <Closure: (dynamic) => dynamic>");
+          matches(
+              r"Expected: throws an exception which matches FormatException +"
+              r"But:  exception \?:<Exception> does not match FormatException\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic)?>"));
     });
 
     test('throwsArgumentError', () {
       shouldPass(() { throw new ArgumentError(''); },
           throwsArgumentError);
       shouldFail(() { throw new Exception(); },
           throwsArgumentError,
-          "Expected: throws an exception which matches ArgumentError "
-          "But:  exception ?:<Exception> does not match "
-              "ArgumentError. "
-          "Actual: <Closure: (dynamic) => dynamic>");
+          matches(
+              r"Expected: throws an exception which matches ArgumentError +"
+              r"But:  exception \?:<Exception> does not match "
+                  r"ArgumentError\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic)?>"));
     });
 
     test('throwsRangeError', () {
       shouldPass(() { throw new RangeError(0); },
           throwsRangeError);
       shouldFail(() { throw new Exception(); },
           throwsRangeError,
-          "Expected: throws an exception which matches RangeError "
-          "But:  exception ?:<Exception> does not match RangeError. "
-          "Actual: <Closure: (dynamic) => dynamic>");
+          matches(
+              r"Expected: throws an exception which matches RangeError +"
+              r"But:  exception \?:<Exception> does not match RangeError\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic)?>"));
     });
 
     test('throwsNoSuchMethodError', () {
       shouldPass(() { throw new NoSuchMethodError(null, '', null, null); },
           throwsNoSuchMethodError);
       shouldFail(() { throw new Exception(); },
           throwsNoSuchMethodError,
-          "Expected: throws an exception which matches NoSuchMethodError "
-          "But:  exception ?:<Exception> does not match "
-              "NoSuchMethodError. "
-          "Actual: <Closure: (dynamic) => dynamic>");
+          matches(
+              r"Expected: throws an exception which matches NoSuchMethodError +"
+              r"But:  exception \?:<Exception> does not match "
+                  r"NoSuchMethodError\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic)?>"));
     });
 
     test('throwsUnimplementedError', () {
       shouldPass(() { throw new UnimplementedError(''); },
           throwsUnimplementedError);
       shouldFail(() { throw new Exception(); },
           throwsUnimplementedError,
-          "Expected: throws an exception which matches UnimplementedError "
-          "But:  exception ?:<Exception> does not match "
-              "UnimplementedError. "
-          "Actual: <Closure: (dynamic) => dynamic>");
+          matches(
+              r"Expected: throws an exception which matches "
+                  r"UnimplementedError +"
+              r"But:  exception \?:<Exception> does not match "
+                  r"UnimplementedError\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic)?>"));
     });
 
     test('throwsUnsupportedError', () {
       shouldPass(() { throw new UnsupportedError(''); },
           throwsUnsupportedError);
       shouldFail(() { throw new Exception(); },
           throwsUnsupportedError,
-          "Expected: throws an exception which matches UnsupportedError "
-          "But:  exception ?:<Exception> does not match "
-              "UnsupportedError. "
-          "Actual: <Closure: (dynamic) => dynamic>");
+          matches(
+              r"Expected: throws an exception which matches UnsupportedError +"
+              r"But:  exception \?:<Exception> does not match "
+                  r"UnsupportedError\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic)?>"));
     });
 
     test('throwsStateError', () {
       shouldPass(() { throw new StateError(''); },
           throwsStateError);
       shouldFail(() { throw new Exception(); },
           throwsStateError,
-          "Expected: throws an exception which matches StateError "
-          "But:  exception ?:<Exception> does not match "
-              "StateError. "
-          "Actual: <Closure: (dynamic) => dynamic>");
+          matches(
+              r"Expected: throws an exception which matches StateError +"
+              r"But:  exception \?:<Exception> does not match "
+                  r"StateError\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic)?>"));
     });
 
     test('returnsNormally', () {
       shouldPass(doesNotThrow, returnsNormally);
       shouldFail(doesThrow, returnsNormally,
-          "Expected: return normally But: threw 'X'. "
-          "Actual: <Closure: (dynamic) => dynamic "
-              "from Function 'doesThrow': static.>");
+          matches(
+              r"Expected: return normally +But:  threw 'X'\."
+              r"Actual: <Closure(: \(dynamic\) => dynamic "
+                  r"from Function 'doesThrow': static\.)?>"));
     });
 
     test('hasLength', () {
       var a = new Map();
       var b = new List();
       shouldPass(a, hasLength(0));
       shouldPass(b, hasLength(0));
       shouldPass('a', hasLength(1));
       shouldFail(0, hasLength(0), new PrefixMatcher(
           "Expected: an object with length of <0> "
@@ skipping 532 matching lines @@
       shouldPass(w, new HasPrice(10));
       shouldPass(w, new HasPrice(greaterThan(0)));
       shouldFail(w, new HasPrice(greaterThan(10)),
           "Expected: Widget with a price that is a value greater than <10> "
           "But: price was <10>. "
           "Actual: <Instance of 'Widget'>");
     });
   });
 }