Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Side by Side Diff: pkg/unittest/expect.dart

Issue 10905013: Change a few more uses of the old try-catch syntax. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « pkg/dartdoc/mirrors/dart2js_mirror.dart ('k') | pkg/unittest/unittest.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, 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 /** 5 /**
6 * This is the main assertion function. It asserts that [actual] 6 * This is the main assertion function. It asserts that [actual]
7 * matches the [matcher]. [matcher] is optional and defaults to isTrue, 7 * matches the [matcher]. [matcher] is optional and defaults to isTrue,
8 * so expect can be used with a single predicate argument. [reason] 8 * so expect can be used with a single predicate argument. [reason]
9 * is optional and is typically not supplied if a reasonable matcher is 9 * is optional and is typically not supplied if a reasonable matcher is
10 * explicitly provided, as a reason can be generated from the matcher. 10 * explicitly provided, as a reason can be generated from the matcher.
(...skipping 23 matching lines...) Expand all
34 * [dart-matchers] https://github.com/Ladicek/dart-matchers 34 * [dart-matchers] https://github.com/Ladicek/dart-matchers
35 */ 35 */
36 void expect(actual, [matcher = isTrue, String reason = null, 36 void expect(actual, [matcher = isTrue, String reason = null,
37 FailureHandler failureHandler = null, 37 FailureHandler failureHandler = null,
38 bool verbose = false]) { 38 bool verbose = false]) {
39 matcher = wrapMatcher(matcher); 39 matcher = wrapMatcher(matcher);
40 bool doesMatch; 40 bool doesMatch;
41 var matchState = new MatchState(); 41 var matchState = new MatchState();
42 try { 42 try {
43 doesMatch = matcher.matches(actual, matchState); 43 doesMatch = matcher.matches(actual, matchState);
44 } catch (var e, var trace) { 44 } catch (e, trace) {
45 doesMatch = false; 45 doesMatch = false;
46 if (reason == null) { 46 if (reason == null) {
47 reason = '${(e is String) ? e : e.toString()} at $trace'; 47 reason = '${(e is String) ? e : e.toString()} at $trace';
48 } 48 }
49 } 49 }
50 if (!doesMatch) { 50 if (!doesMatch) {
51 if (failureHandler == null) { 51 if (failureHandler == null) {
52 failureHandler = getOrCreateExpectFailureHandler(); 52 failureHandler = getOrCreateExpectFailureHandler();
53 } 53 }
54 failureHandler.failMatch(actual, matcher, reason, matchState, verbose); 54 failureHandler.failMatch(actual, matcher, reason, matchState, verbose);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 * formatter is returned; this allows custom expect handlers to easily 137 * formatter is returned; this allows custom expect handlers to easily
138 * get a reference to the default formatter. 138 * get a reference to the default formatter.
139 */ 139 */
140 ErrorFormatter configureExpectFormatter([ErrorFormatter formatter = null]) { 140 ErrorFormatter configureExpectFormatter([ErrorFormatter formatter = null]) {
141 if (formatter == null) { 141 if (formatter == null) {
142 formatter = _defaultErrorFormatter; 142 formatter = _defaultErrorFormatter;
143 } 143 }
144 return _assertErrorFormatter = formatter; 144 return _assertErrorFormatter = formatter;
145 } 145 }
146 146
OLDNEW
« no previous file with comments | « pkg/dartdoc/mirrors/dart2js_mirror.dart ('k') | pkg/unittest/unittest.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698