Big merge from experimental to bleeding edge.

pkg/intl/test/intl_message_test.dart

Index: pkg/intl/test/intl_message_test.dart
diff --git a/pkg/intl/test/intl_message_test.dart b/pkg/intl/test/intl_message_test.dart
index 6d433cd4916b6a5b0c86ae1e618c01a15967e86e..f8bcd5e32b29d074d70e968e655e0346ba8121ac 100644
--- a/pkg/intl/test/intl_message_test.dart
+++ b/pkg/intl/test/intl_message_test.dart
@@ -25,13 +25,13 @@ runTests(_) {
   test('Trivial Message', () {
     hello() => Intl.message('Hello, world!',
         desc: 'hello world string');
-    expect(hello(), equals('Hello, world!'));
+    expect(hello(), completion(equals('Hello, world!')));
   });
 
   test('Message with one parameter', () {
     lucky(number) => Intl.message('Your lucky number is $number',
         desc: 'number str', examples: {'number': 2});
-    expect(lucky(3), equals('Your lucky number is 3'));
+    expect(lucky(3), completion(equals('Your lucky number is 3')));
   });
 
   test('Message with multiple plural cases (whole message)', () {
@@ -42,9 +42,9 @@ runTests(_) {
            'other': 'There are $number emails left.'}),
           desc: 'Message telling user how many emails will be sent.',
           examples: {'number': 32});
-    expect(emails(5), equals('There are 5 emails left.'));
-    expect(emails(0), equals('There are no emails left.'));
-    expect(emails(1), equals('There is one email left.'));
+    expect(emails(5), completion(equals('There are 5 emails left.')));
+    expect(emails(0), completion(equals('There are no emails left.')));
+    expect(emails(1), completion(equals('There is one email left.')));
   });
 
   test('Message with multiple plural cases (partial message)', () {
@@ -55,9 +55,9 @@ runTests(_) {
          'other': 'are'})} $number messages left.",
           desc: 'Message telling user how many emails will be sent.',
           examples: {'number': 32});
-    expect(emails(5), equals('There are 5 messages left.'));
-    expect(emails(0), equals('There are 0 messages left.'));
-    expect(emails(1), equals('There is 1 messages left.'));
+    expect(emails(5), completion(equals('There are 5 messages left.')));
+    expect(emails(0), completion(equals('There are 0 messages left.')));
+    expect(emails(1), completion(equals('There is 1 messages left.')));
   });
 
   test('Message with dictionary parameter', () {
@@ -66,7 +66,7 @@ runTests(_) {
         desc: "States a person's name.",
         examples: {'first': 'Ford', 'last': 'Prefect'});
     expect(hello({'first' : 'Ford', 'last' : 'Prefect'}),
-      equals('Hello, my name is Ford Prefect'));
+      completion(equals('Hello, my name is Ford Prefect')));
   });
 
   test('Message with object parameter', () {
@@ -75,18 +75,19 @@ runTests(_) {
         desc: "States a person's name.",
         examples: {'first': 'Ford', 'last' : 'Prefect'});
     var ford = new Person('Ford', 'Prefect');
-    expect(hello(ford), equals('Hello, my name is Ford Prefect.'));
+    expect(hello(ford), completion(equals('Hello, my name is Ford Prefect.')));
   });
 
   test('WithLocale test', () {
     hello() => Intl.message('locale=${Intl.getCurrentLocale()}',
         desc: 'explains the locale');
-    expect(Intl.withLocale('en-US', () => hello()), equals('locale=en-US'));
+    expect(Intl.withLocale('en-US', () => hello()),
+           completion(equals('locale=en-US')));
   });
 
   test('Test passing locale', () {
     hello(a_locale) => Intl.message('locale=${Intl.getCurrentLocale()}',
         desc: 'explains the locale', locale: a_locale);
-    expect(hello('en-US'), equals('locale=en_US'));
+    expect(hello('en-US'), completion(equals('locale=en_US')));
   });
 }