Some unit test fixes

lib/unittest/expect.dart

Index: lib/unittest/expect.dart
===================================================================
--- lib/unittest/expect.dart	(revision 8732)
+++ lib/unittest/expect.dart	(working copy)
@@ -33,7 +33,20 @@
  *     [dart-matchers] https://github.com/Ladicek/dart-matchers
  */
 void expect(actual, [matcherOrReason = null, String reason = '']) {

[eub, 2012/06/15 21:02:49]

BTW, I imagine you had prior review discussion of splitting this into
    assert(predicate_expression, [reason]
and
    expect(actual, matcher, [reason])
?

[gram, 2012/06/15 21:25:55]

Yes - the aim is to have just one expect(), but to have it support shorthand
cases, such as:

expect(foo);

expect(foo, 10);

as well as:

expect(foo, isTrue);

expect(foo, equals(10));

The only controversy comes from the ambiguous:

expect(foo, "bar");

which we currently treat as an assert(foo) reason bar.

Given that we have named arguments, we could change this to not overload the
second argument, while still asserting in there is no matcher, so:

expect(foo, "bar") means expect(foo, equals("bar"))

and the previous case would need to be:

expect(foo, reason:"bar");

I'm quite open to that change if you think it is an improvement but I'd like to
make that a separate CL.

-  if (matcherOrReason is Matcher) {
+  if (actual is bool && 
+     (matcherOrReason == null || matcherOrReason is String)) {
+    // Treat this as an assert(predicate, reason).
+    if (!actual) {
+      reason = (matcherOrReason == null) ? 'Assertion failed' : matcherOrReason;
+      // Make sure we have a failure handler configured.
+      configureExpectHandler(_assertFailureHandler);
+      _assertFailureHandler.fail(reason);
+    }
+  } else {
+    // Treat this as an expect(value, matcher, [reason]).
+    if (matcherOrReason is! Matcher) {
+      matcherOrReason = wrapMatcher(matcherOrReason);
+    }
     var doesMatch;
     try {
       doesMatch = matcherOrReason.matches(actual);
@@ -48,13 +61,6 @@
       configureExpectHandler(_assertFailureHandler);
       _assertFailureHandler.failMatch(actual, matcherOrReason, reason);
     }
-  } else {
-    if (!actual) {
-      reason = (matcherOrReason == null) ? 'Assertion failed' : matcherOrReason;
-      // Make sure we have a failure handler configured.
-      configureExpectHandler(_assertFailureHandler);
-      _assertFailureHandler.fail(reason);
-    }
   }
 }