| Index: test/throws_matchers_test.dart | 
| diff --git a/test/throws_matchers_test.dart b/test/throws_matchers_test.dart | 
| index 74ff82dd0f0ad25816605f5f8e7fdb1d7aa7cb4c..f7660022af555ce35c46a7c13cce4cbb4f6274f2 100644 | 
| --- a/test/throws_matchers_test.dart | 
| +++ b/test/throws_matchers_test.dart | 
| @@ -12,40 +12,32 @@ import 'test_utils.dart'; | 
| void main() { | 
| initUtils(); | 
|  | 
| - | 
| test('throws', () { | 
| -    shouldFail(doesNotThrow, throws, | 
| -        matches( | 
| -            r"Expected: throws" | 
| -            r"  Actual: <Closure(: \(\) => dynamic " | 
| -            r"from Function 'doesNotThrow': static\.)?>" | 
| -            r"   Which: did not throw")); | 
| +    shouldFail(doesNotThrow, throws, matches(r"Expected: throws" | 
| +        r"  Actual: <Closure(: \(\) => dynamic " | 
| +        r"from Function 'doesNotThrow': static\.)?>" | 
| +        r"   Which: did not throw")); | 
| shouldPass(doesThrow, throws); | 
| -    shouldFail(true, throws, | 
| -        "Expected: throws" | 
| +    shouldFail(true, throws, "Expected: throws" | 
| "  Actual: <true>" | 
| "   Which: is not a Function or Future"); | 
| }); | 
|  | 
| test('throwsA', () { | 
| shouldPass(doesThrow, throwsA(equals('X'))); | 
| -    shouldFail(doesThrow, throwsA(equals('Y')), | 
| -        matches( | 
| -            r"Expected: throws 'Y'" | 
| -            r"  Actual: <Closure(: \(\) => dynamic " | 
| -            r"from Function 'doesThrow': static\.)?>" | 
| -            r"   Which: threw 'X'")); | 
| +    shouldFail(doesThrow, throwsA(equals('Y')), matches(r"Expected: throws 'Y'" | 
| +        r"  Actual: <Closure(: \(\) => dynamic " | 
| +        r"from Function 'doesThrow': static\.)?>" | 
| +        r"   Which: threw 'X'")); | 
| }); | 
|  | 
| test('throwsA', () { | 
| shouldPass(doesThrow, throwsA(equals('X'))); | 
| -    shouldFail(doesThrow, throwsA(equals('Y')), | 
| -        matches("Expected: throws 'Y'.*" | 
| +    shouldFail(doesThrow, throwsA(equals('Y')), matches("Expected: throws 'Y'.*" | 
| "Actual: <Closure.*" | 
| "Which: threw 'X'")); | 
| }); | 
|  | 
| - | 
| group('exception/error matchers', () { | 
| test('throwsCyclicInitializationError', () { | 
| expect(() => _Bicycle.foo, throwsCyclicInitializationError); | 
| @@ -53,7 +45,7 @@ void main() { | 
|  | 
| test('throwsConcurrentModificationError', () { | 
| expect(() { | 
| -        var a = { 'foo': 'bar' }; | 
| +        var a = {'foo': 'bar'}; | 
| for (var k in a.keys) { | 
| a.remove(k); | 
| } | 
| @@ -73,4 +65,3 @@ class _Bicycle { | 
| return foo + 1; | 
| } | 
| } | 
| - | 
|  |