Changes to the i18n messages so that they are invoked as

tests/lib/i18n/intl_message_test.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.
 
 
 #library('intl_message_test');
 
 #import('../../../lib/i18n/intl.dart');
 #import('../../../lib/i18n/intl_message.dart');
 #import('../../../lib/unittest/unittest.dart');
 
 /**
  * Tests the MessageFormat library in dart.
  */
 
+

[Emily Fortuna, 2012/06/08 21:50:37]

get rid of extra whitespace, please

[Alan Knight, 2012/06/08 22:04:53]

Done.

+class Person {
+  String firstName, lastName;
+  Person(this.firstName, this.lastName);
+}
+
 main() {
+

[Emily Fortuna, 2012/06/08 21:50:37]

extra whitespace

[Alan Knight, 2012/06/08 22:04:53]

I thought this was useful as being something that's declaring a variable used in
all of the tests, so associating it with the first one seemed misleading.

[Emily Fortuna, 2012/06/08 22:09:40]

The problem is not the whitespace at line 25, but the whitespace at line 23.

[Alan Knight, 2012/06/08 22:14:21]

Ah, ok. Done.

+  Intl intl = new Intl();
+
   test('Trivial Message', () {
-    msg_format() => new IntlMessage('Hello, world!',
+    hello() => intl.message('Hello, world!',
         desc: 'hello world string');
+    expect(hello(), equals('Hello, world!'));
   });
-  //expect(msg_format(), 'Hello, world!');
 
-  test('One num', () {
-    msg_format(number) => new IntlMessage('Your lucky number is $number',
+  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(msg_format(3), 'Your lucky number is 3');
 
-  test('Message formatting', () {
-    msg_format(number) => new IntlMessage(
+  test('Message with multiple plural cases (whole message)', () {
+    emails(number) => intl.message(
         Intl.plural(number,
           {'0': 'There are no emails left.',
            '1': 'There is one email left.',
            '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.'));
   });
-  // TODO(efortuna): Uncomment when functioning correctly.
-  //expect(msg_format(5), '5 emails will be sent.');
- 
-  test('Message formatting with dictionary', () {
-    msg_format(dict) => new IntlMessage(
+
+  test('Message with multiple plural cases (partial message)', () {
+    emails(number) => intl.message(
+      "There ${Intl.plural(number,
+        {'0': 'are',
+         '1': 'is',
+         '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.'));
+  });
+
+  test('Message with dictionary parameter', () {
+    hello(dict) => intl.message(
         "Hello, my name is ${dict['first']} ${dict['last']}",
-          desc: "States a person's name.",
-          examples: {'first': 'Ford', 'last': 'Prefect'});
+        desc: "States a person's name.",
+        examples: {'first': 'Ford', 'last': 'Prefect'});
+    expect(hello({'first' : 'Ford', 'last' : 'Prefect'}),
+      equals('Hello, my name is Ford Prefect'));
   });
-  //expect(msg_format({'first' : 'Ford', 'last' : 'Prefect'),
-  //    'Hello, my name is Ford Prefect');
+
+  test('Message with object parameter', () {
+    hello(person) => intl.message(
+        "Hello, my name is ${person.firstName} ${person.lastName}.",
+        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.'));
+  });
 }