Revert revision 33053

third_party/pkg/di/test/fixed-unittest.dart

 library unittest;
 
 import 'package:unittest/unittest.dart';
 import 'package:di/mirrors.dart';
 import 'dart:async';
 
 export 'package:unittest/unittest.dart';
 
 // Jasmine-like syntax for unittest.
 void describe(String spec, TestFunction body) => group(spec, body);
 void ddescribe(String spec, TestFunction body) => solo_group(spec, body);
 void xdescribe(String spec, TestFunction body) {}
 void it(String spec, TestFunction body) => test(spec, body);
 void xit(String spec, TestFunction body) {}
 void iit(String spec, TestFunction body) => solo_test(spec, body);
 
 Matcher toEqual(expected) => equals(expected);
 Matcher toContain(expected) => contains(expected);
 Matcher toBe(expected) => same(expected);
 Matcher instanceOf(Type t) => new IsInstanceOfTypeMatcher(t);
 
-Matcher toThrow(Type exceptionClass, [message]) => message == null
-      ? new ThrowsMatcher(instanceOf(exceptionClass))
-      : new ThrowsMatcher(new ComplexExceptionMatcher(
-          instanceOf(exceptionClass),
-          message is Matcher ? message : toContain(message)));
+Matcher toThrow(Type exceptionClass, String message) =>
+  new ThrowsMatcher(new ComplexExceptionMatcher(
+      instanceOf(exceptionClass), toContain(message)));
 
 Matcher not(Matcher matcher) => new NegateMatcher(matcher);
 
 
 class NegateMatcher extends Matcher {
   final Matcher _matcher;
 
   const NegateMatcher(this._matcher);
 
   bool matches(obj, Map ms) => !_matcher.matches(obj, ms);
@@ skipping 64 matching lines @@
   Type t;
 
   IsInstanceOfTypeMatcher(this.t);
 
   bool matches(obj, Map matchState) =>
       reflect(obj).type.qualifiedName == reflectClass(t).qualifiedName;
 
   Description describe(Description description) =>
       description.add('an instance of ${t.toString()}');
 }