Parameterize the import directories, fix test to behave correctly on an error

pkg/intl/test/message_extraction/message_extraction_test.dart

 // Copyright (c) 2013, 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 message_extraction_test;
 
 import 'package:unittest/unittest.dart';
 import 'dart:io';
 import 'dart:async';
 import 'package:pathos/path.dart' as path;
@@ skipping 37 matching lines @@
  * Translate a file path into this test directory, regardless of the
  * working directory.
  */
 String dir([String s]) =>
     path.join(intlDirectory, 'test', 'message_extraction', s);
 
 main() {
   test("Test round trip message extraction, translation, code generation, "
       "and printing", () {
     deleteGeneratedFiles();
-    extractMessages(null).then((result) {

[Emily Fortuna, 2013/03/19 20:31:37]

if you just add a return statement at this line:
return extractMessage(null)..... 

you should get what you're looking for.

[Alan Knight, 2013/03/19 20:53:46]

Done.

-      return generateTranslationFiles(result);
-    }).then((result) {
-      return generateCodeFromTranslation(result);
-    }).then((result) {
-      return runGeneratedCode(result);
-    }).then(verifyResult);
+    return runTheTest();
   });
 }
 
+Future runTheTest() {
+  return extractMessages(null).then((result) {
+    return generateTranslationFiles(result);
+  }).then((result) {
+    return generateCodeFromTranslation(result);
+  }).then((result) {
+    return runGeneratedCode(result);
+  }).then(verifyResult);
+}
+
 void deleteGeneratedFiles() {
   var files = [dir('intl_messages.json'), dir('translation_fr.json'),
       dir('messages_fr.dart'), dir('message_de_DE.dart'),
       dir('messages_all.dart')];
   files.map((name) => new File(name)).forEach((x) {
     if (x.existsSync()) x.deleteSync();});
 }
 
 /**
  * Run the process with the given list of filenames, which we assume
@@ skipping 39 matching lines @@
 Future<ProcessResult> generateCodeFromTranslation(ProcessResult previousResult)
     => run(
         previousResult,
         ['generate_from_json.dart', 'sample_with_messages.dart',
              'part_of_sample_with_messages.dart', 'translation_fr.json',
              'translation_de_DE.json' ]);
 
 Future<ProcessResult> runGeneratedCode(ProcessResult previousResult) =>
     run(previousResult, ['sample_with_messages.dart']);
 
-void verifyResult(results) {
+verifyResult(results) {
   var lineIterator;
   verify(String s) {
     lineIterator.moveNext();
     var value = lineIterator.current;
     expect(value, s);
   }
 
   var output = results.stdout;
   var lines = output.split("\n");
   // If it looks like these are CRLF delimited, then use that. Wish strings
@@ skipping 75 matching lines @@
   verify("Diese Methode ist nicht eine Lambda");
   verify("Dies ergibt sich aus einer statischen Methode");
   verify("This is missing some translations");
   verify("Antike griechische Galgenmännchen Zeichen: 𐅆𐅇");
 //  verify("Die Sache ist, well");
 //  expect("Einer der knifflige Dinge ist der Plural");
 //  expect("Zu den kniffligen Dinge Pluralformen");
   verify("Escapes: ");
   verify("\r\f\b\t\v.");
 }