Add pretty-printing to unittest and more thoroughly print values.

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 155 matching lines @@
                     'with key <${key}> ${location}', depth+1);
                 if (reason != null) {
                   break;
                 }
               }
             }
           }
         }
       } else {
         reason = new StringDescription();
-        var eType = typeName(expected);
-        var aType = typeName(actual);
-        var includeTypes = eType != aType;

[gram, 2013/05/17 01:00:30]

What was the motivation in taking this out? John requested a while back that we
display mismatched types so that when things print the same but the types are
different it can still be detected.

[nweiz, 2013/05/17 19:50:56]

This functionality is in prettyPrint now. For objects where the types aren't
obvious -- anything other than a num, bool, Function, null, List, Map, or String
-- the type will be printed as part of the pretty-printing (as long as it's
public).

[gram, 2013/05/17 20:38:32]

Yes, sorry, I should have deleted this; I spotted the change in prettyPrint
later in the review.

On 2013/05/17 19:50:56, nweiz wrote:

         // If we have recursed, show the expected value too; if not,
         // expect() will show it for us.
         if (depth > 0) {
           reason.add('expected ');
-          if (includeTypes) {
-            reason.add(eType).add(':');
-          }
           reason.addDescriptionOf(expected).add(' but ');
         }
         reason.add('was ');
-        if (includeTypes) {
-          reason.add(aType).add(':');
-        }
         reason.addDescriptionOf(actual);
-        if (includeTypes && depth == 0) {
-          reason.add(' (not type ').add(eType).add(')');
-        }
       }
     }
     if (reason != null && location.length > 0) {
       reason.add(' ').add(location);
     }
     return reason;
   }
 
-  String typeName(x) {
-    // dart2js blows up on some objects (e.g. window.navigator).
-    // So we play safe here.
-    try {
-      if (x == null) return "null";
-      return x.runtimeType.toString();
-    } catch (e) {
-      return "Unknown";
-    }
-  }
-
   String _match(expected, actual) {
     Description reason = _recursiveMatch(expected, actual, '', 0);
     return reason == null ? null : reason.toString();
   }
 
   // TODO(gram) - see if we can make use of matchState here to avoid
   // recursing again in describeMismatch.
   bool matches(item, MatchState matchState) => _match(_expected, item) == null;
 
   Description describe(Description description) =>
@@ skipping 351 matching lines @@
   bool matches(item, MatchState matchState) {
     return _matcher.matches(item.length, matchState);
   }
 
   Description describe(Description description) =>
     description.add('an object with length of ').
         addDescriptionOf(_matcher);
 
   Description describeMismatch(item, Description mismatchDescription,
                                MatchState matchState, bool verbose) {
-    super.describeMismatch(item, mismatchDescription, matchState, verbose);
     try {
       // We want to generate a different description if there is no length
       // property. This is harmless code that will throw if no length property
       // but subtle enough that an optimizer shouldn't strip it out.
       if (item.length * item.length >= 0) {
-        return mismatchDescription.add(' with length of ').
+        return mismatchDescription.add('had length of ').
             addDescriptionOf(item.length);
       }
     } catch (e) {
-      return mismatchDescription.add(' has no length property');
+      return mismatchDescription.add('had no length property');
     }
   }
 }
 
 /**
  * Returns a matcher that matches if the match argument contains
  * the expected value. For [String]s this means substring matching;
  * for [Map]s it means the map has the key, and for [Iterable]s
  * (including [Iterable]s) it means the iterable has a matching
  * element. In the case of iterables, [expected] can itself be a
@@ skipping 118 matching lines @@
       description.add(_featureDescription).add(' ').addDescriptionOf(_matcher);
 
   Description describeMismatch(item, Description mismatchDescription,
                                MatchState matchState, bool verbose) {
     mismatchDescription.add(_featureName).add(' ');
     _matcher.describeMismatch(matchState.state['feature'], mismatchDescription,
         matchState.state['innerState'], verbose);
     return mismatchDescription;
   }
 }