| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library matcher.throws_matcher; | 5 library matcher.throws_matcher; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'expect.dart'; | 9 import 'expect.dart'; |
| 10 import 'interfaces.dart'; | 10 import 'interfaces.dart'; |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 } | 86 } |
| 87 | 87 |
| 88 Description describe(Description description) { | 88 Description describe(Description description) { |
| 89 if (_matcher == null) { | 89 if (_matcher == null) { |
| 90 return description.add("throws"); | 90 return description.add("throws"); |
| 91 } else { | 91 } else { |
| 92 return description.add('throws ').addDescriptionOf(_matcher); | 92 return description.add('throws ').addDescriptionOf(_matcher); |
| 93 } | 93 } |
| 94 } | 94 } |
| 95 | 95 |
| 96 Description describeMismatch(item, Description mismatchDescription, | 96 Description describeMismatch( |
| 97 Map matchState, | 97 item, Description mismatchDescription, Map matchState, bool verbose) { |
| 98 bool verbose) { | |
| 99 if (item is! Function && item is! Future) { | 98 if (item is! Function && item is! Future) { |
| 100 return mismatchDescription.add('is not a Function or Future'); | 99 return mismatchDescription.add('is not a Function or Future'); |
| 101 } else if (_matcher == null || matchState['exception'] == null) { | 100 } else if (_matcher == null || matchState['exception'] == null) { |
| 102 return mismatchDescription.add('did not throw'); | 101 return mismatchDescription.add('did not throw'); |
| 103 } else { | 102 } else { |
| 104 mismatchDescription. add('threw '). | 103 mismatchDescription |
| 105 addDescriptionOf(matchState['exception']); | 104 .add('threw ') |
| 105 .addDescriptionOf(matchState['exception']); |
| 106 if (verbose) { | 106 if (verbose) { |
| 107 mismatchDescription.add(' at ').add(matchState['stack'].toString()); | 107 mismatchDescription.add(' at ').add(matchState['stack'].toString()); |
| 108 } | 108 } |
| 109 return mismatchDescription; | 109 return mismatchDescription; |
| 110 } | 110 } |
| 111 } | 111 } |
| 112 } | 112 } |
| 113 | |
| OLD | NEW |