Allow suppressing message extraction warnings, providing a prefix for generated files, and format w…

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 30 matching lines @@
   return null;
 }
 
 /** If our package root directory is set, return it as a VM argument. */
 final vmArgs = (packageDir == null) ? [] : ['--package-root=$packageDir'];
 
 /**
  * Translate a file path into this test directory, regardless of the
  * working directory.
  */
-String dir([String s]) =>
-    path.join(intlDirectory, 'test', 'message_extraction', s);
+String dir([String s]) {
+  if (s != null && s.startsWith("--")) { // Don't touch command-line options.
+    return s;
+  } else {
+   return path.join(intlDirectory, 'test', 'message_extraction', s);
+  }
+}
 
 main() {
   test("Test round trip message extraction, translation, code generation, "
       "and printing", () {
     deleteGeneratedFiles();
     return extractMessages(null).then((result) {
       return generateTranslationFiles(result);
     }).then((result) {
       return generateCodeFromTranslation(result);
     }).then((result) {
       return runGeneratedCode(result);
     }).then(verifyResult)
     .whenComplete(deleteGeneratedFiles);
   });
 }
 
 void deleteGeneratedFiles() {
   var files = [dir('intl_messages.json'), dir('translation_fr.json'),
-      dir('messages_fr.dart'), dir('messages_de_DE.dart'),
-      dir('translation_de_DE.json'), dir('messages_all.dart')];
+      dir('foo_messages_fr.dart'), dir('foo_messages_de_DE.dart'),
+      dir('translation_de_DE.json'), dir('foo_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
  * are in dir() and need to be qualified in case that's not our working
  * directory.
  */
 Future<ProcessResult> run(ProcessResult previousResult, List<String> filenames)
@@ skipping 17 matching lines @@
       ..addAll(filesInTheRightDirectory.skip(1));
   var options = new ProcessOptions()
       ..stdoutEncoding=Encoding.UTF_8
       ..stderrEncoding=Encoding.UTF_8;
   var result = Process.run(dart, args);
   return result;
 }
 
 Future<ProcessResult> extractMessages(ProcessResult previousResult) => run(
     previousResult,
-    ['extract_to_json.dart', 'sample_with_messages.dart',
+    ['extract_to_json.dart', '--suppress-warnings', 'sample_with_messages.dart',
         'part_of_sample_with_messages.dart']);
 
 Future<ProcessResult> generateTranslationFiles(ProcessResult previousResult) =>
     run(
         previousResult,
         ['make_hardcoded_translation.dart', 'intl_messages.json']);
 
 Future<ProcessResult> generateCodeFromTranslation(ProcessResult previousResult)
     => run(
         previousResult,
-        ['generate_from_json.dart', 'sample_with_messages.dart',
+        ['generate_from_json.dart', '--generated-file-prefix=foo_',
+         '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']);
 
 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
-  // just implemented last.
-  if (lines.first.codeUnits.last == "\r".codeUnits.first) {
+  // If it looks like these are CRLF delimited, then use that.
+  if (lines.first.endsWith("\r")) {
     lines = output.split("\r\n");
   }
   lineIterator = lines.iterator..moveNext();
   verify("Printing messages for en_US");
   verify("This is a message");
   verify("Another message with parameter hello");
   verify("Characters that need escaping, e.g slashes \\ dollars \${ "
       "(curly braces are ok) and xml reserved characters <& and "
       "quotes \" parameters 1, 2, and 3");
   verify("This string extends across multiple lines.");
@@ skipping 63 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.");
 }