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

Unified Diff: pkg/unittest/lib/src/core_matchers.dart

Issue 18442002: Add missing newline after Actual value in fail message. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/unittest/lib/src/basematcher.dart ('k') | pkg/unittest/lib/src/expect.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/unittest/lib/src/core_matchers.dart
===================================================================
--- pkg/unittest/lib/src/core_matchers.dart (revision 24669)
+++ pkg/unittest/lib/src/core_matchers.dart (working copy)
@@ -10,7 +10,7 @@
*/
const Matcher isEmpty = const _Empty();
-class _Empty extends BaseMatcher {
+class _Empty extends Matcher {
const _Empty();
bool matches(item, Map matchState) {
if (item is Map || item is Iterable) {
@@ -31,14 +31,14 @@
/** A matcher that matches any non-null value. */
const Matcher isNotNull = const _IsNotNull();
-class _IsNull extends BaseMatcher {
+class _IsNull extends Matcher {
const _IsNull();
bool matches(item, Map matchState) => item == null;
Description describe(Description description) =>
description.add('null');
}
-class _IsNotNull extends BaseMatcher {
+class _IsNotNull extends Matcher {
const _IsNotNull();
bool matches(item, Map matchState) => item != null;
Description describe(Description description) =>
@@ -51,14 +51,14 @@
/** A matcher that matches anything except the Boolean value true. */
const Matcher isFalse = const _IsFalse();
-class _IsTrue extends BaseMatcher {
+class _IsTrue extends Matcher {
const _IsTrue();
bool matches(item, Map matchState) => item == true;
Description describe(Description description) =>
description.add('true');
}
-class _IsFalse extends BaseMatcher {
+class _IsFalse extends Matcher {
const _IsFalse();
bool matches(item, Map matchState) => item == false;
Description describe(Description description) =>
@@ -71,7 +71,7 @@
*/
Matcher same(expected) => new _IsSameAs(expected);
-class _IsSameAs extends BaseMatcher {
+class _IsSameAs extends Matcher {
final _expected;
const _IsSameAs(this._expected);
bool matches(item, Map matchState) => identical(item, _expected);
@@ -90,7 +90,7 @@
? new _StringEqualsMatcher(expected)
: new _DeepMatcher(expected, limit);
-class _DeepMatcher extends BaseMatcher {
+class _DeepMatcher extends Matcher {
final _expected;
final int _limit;
var count;
@@ -234,7 +234,7 @@
}
/** A special equality matcher for strings. */
-class _StringEqualsMatcher extends BaseMatcher {
+class _StringEqualsMatcher extends Matcher {
final String _value;
_StringEqualsMatcher(this._value);
@@ -314,7 +314,7 @@
/** A matcher that matches any value. */
const Matcher anything = const _IsAnything();
-class _IsAnything extends BaseMatcher {
+class _IsAnything extends Matcher {
const _IsAnything();
bool matches(item, Map matchState) => true;
Description describe(Description description) =>
@@ -343,7 +343,7 @@
* fail. This is because dart2js currently ignores template type
* parameters.
*/
-class isInstanceOf<T> extends BaseMatcher {
+class isInstanceOf<T> extends Matcher {
final String _name;
const isInstanceOf([name = 'specified type']) : this._name = name;
bool matches(obj, Map matchState) => obj is T;
@@ -395,7 +395,7 @@
*/
const Matcher returnsNormally = const _ReturnsNormally();
-class Throws extends BaseMatcher {
+class Throws extends Matcher {
final Matcher _matcher;
const Throws([Matcher matcher]) :
@@ -466,7 +466,7 @@
}
}
-class _ReturnsNormally extends BaseMatcher {
+class _ReturnsNormally extends Matcher {
const _ReturnsNormally();
bool matches(f, Map matchState) {
@@ -514,7 +514,7 @@
* for each exception type.
*/
-abstract class TypeMatcher extends BaseMatcher {
+abstract class TypeMatcher extends Matcher {
final String _name;
const TypeMatcher(this._name);
Description describe(Description description) =>
@@ -640,7 +640,7 @@
Matcher hasLength(matcher) =>
new _HasLength(wrapMatcher(matcher));
-class _HasLength extends BaseMatcher {
+class _HasLength extends Matcher {
final Matcher _matcher;
const _HasLength([Matcher matcher = null]) : this._matcher = matcher;
@@ -685,7 +685,7 @@
*/
Matcher contains(expected) => new _Contains(expected);
-class _Contains extends BaseMatcher {
+class _Contains extends Matcher {
final _expected;
@@ -726,7 +726,7 @@
*/
Matcher isIn(expected) => new _In(expected);
-class _In extends BaseMatcher {
+class _In extends Matcher {
final _expected;
@@ -756,7 +756,7 @@
Matcher predicate(Function f, [description ='satisfies function']) =>
new _Predicate(f, description);
-class _Predicate extends BaseMatcher {
+class _Predicate extends Matcher {
final Function _matcher;
final String _description;
@@ -780,7 +780,7 @@
* have a Widget class where each Widget has a price; we could make a
* FeatureMatcher that can make assertions about prices with:
*
- * class HasPrice extends FeatureMatcher {
+ * class HasPrice extends CustomMatcher {
* const HasPrice(matcher) :
* super("Widget with price that is", "price", matcher);
* featureValueOf(actual) => actual.price;
@@ -790,7 +790,7 @@
*
* expect(inventoryItem, new HasPrice(greaterThan(0)));
*/
-class CustomMatcher extends BaseMatcher {
+class CustomMatcher extends Matcher {
final String _featureDescription;
final String _featureName;
final Matcher _matcher;
« no previous file with comments | « pkg/unittest/lib/src/basematcher.dart ('k') | pkg/unittest/lib/src/expect.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698