Added hasProperty matcher.

pkg/unittest/lib/src/core_matchers.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.
 
 part of matcher;
 
 /**
  * Returns a matcher that matches empty strings, maps or iterables
  * (including collections).
  */
@@ skipping 831 matching lines @@
  * A useful utility class for implementing other matchers through inheritance.
  * Derived classes should call the base constructor with a feature name and
  * description, and an instance matcher, and should implement the
  * [featureValueOf] abstract method.
  *
  * The feature description will typically describe the item and the feature,
  * while the feature name will just name the feature. For example, we may
  * have a Widget class where each Widget has a price; we could make a
  * [CustomMatcher] that can make assertions about prices with:
  *
-<<<<<<< .mine
  *     class HasPrice extends CustomMatcher {
  *       const HasPrice(matcher) :
-=======
- *     class HasPrice extends CustomMatcher {
- *       HasPrice(matcher) :
->>>>>>> .r25321
  *           super("Widget with price that is", "price", matcher);
  *       featureValueOf(actual) => actual.price;
  *     }
  *
  * and then use this for example like:
  *
  *      expect(inventoryItem, new HasPrice(greaterThan(0)));
  */
 class CustomMatcher extends Matcher {
   final String _featureDescription;
@@ skipping 22 matching lines @@
         addDescriptionOf(matchState['feature']);
     var innerDescription = new StringDescription();
     _matcher.describeMismatch(matchState['feature'], innerDescription,
         matchState['state'], verbose);
     if (innerDescription.length > 0) {
       mismatchDescription.add(' which ').add(innerDescription.toString());
     }
     return mismatchDescription;
   }
 }
-