Reenable analyze_api and add exceptions to white-list.

tests/compiler/dart2js/analyze_helper.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 analyze_helper;
 
-import "package:expect/expect.dart";
 import 'dart:async';
 import 'dart:io';
 import '../../../sdk/lib/_internal/compiler/compiler.dart' as api;
 import '../../../sdk/lib/_internal/compiler/implementation/apiimpl.dart';
 import '../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart'
     hide Compiler;
 import '../../../sdk/lib/_internal/compiler/implementation/filenames.dart';
 import '../../../sdk/lib/_internal/compiler/implementation/source_file_provider.dart';
+import '../../../sdk/lib/_internal/compiler/implementation/util/uri_extras.dart';
 
 /**
  * Map of whitelisted warnings and errors.
  *
  * Only add a whitelisting together with a bug report to dartbug.com and add
  * the bug issue number as a comment on the whitelisting.
  *
  * Use an identifiable suffix of the file uri as key. Use a fixed substring of
  * the error/warning message in the list of whitelistings for each file.
  */
@@ skipping 13 matching lines @@
       : super(provider) {
     whiteList.forEach((String file, List<String> messageParts) {
       var useMap = new Map<String,int>();
       for (String messagePart in messageParts) {
         useMap[messagePart] = 0;
       }
       whiteListMap[file] = useMap;
     });
   }
 
-  void checkResults() {
-    Expect.isFalse(hasWarnings);
-    Expect.isFalse(hasHint);
-    Expect.isFalse(hasErrors);
-    Expect.isTrue(checkWhiteListUse());
+  bool checkResults() {
+    bool validWhiteListUse = checkWhiteListUse();
     reportWhiteListUse();
+    return !hasWarnings && !hasHint && !hasErrors && validWhiteListUse;
   }
 
   bool checkWhiteListUse() {
     bool allUsed = true;
     for (String file in whiteListMap.keys) {
       for (String messagePart in whiteListMap[file].keys) {
         if (whiteListMap[file][messagePart] == 0) {
           print("Whitelisting '$messagePart' is unused in '$file'. "
                 "Remove the whitelisting from the whitelist map.");
           allUsed = false;
@@ skipping 54 matching lines @@
       }
       hasErrors = true;
     }
     super.diagnosticHandler(uri, begin, end, message, kind);
   }
 }
 
 Future analyze(List<Uri> uriList,
                Map<String, List<String>> whiteList,
                {bool analyzeAll: true}) {
+  String testFileName =
+      relativize(Uri.base, Platform.script, Platform.isWindows);
+
+  print("""
+
+
+=== 
+=== NOTE: If this test fails, update [WHITE_LIST] in $testFileName
+===
+
+
+""");
+
   var libraryRoot = currentDirectory.resolve('sdk/');
   var provider = new CompilerSourceFileProvider();
   var handler = new CollectingDiagnosticHandler(whiteList, provider);
   var options = <String>['--analyze-only', '--categories=Client,Server'];
   if (analyzeAll) options.add('--analyze-all');
   var compiler = new Compiler(
       provider.readStringFromUri,
       null,
       handler.diagnosticHandler,
       libraryRoot, libraryRoot,
       options,
       {});
+  String MESSAGE = """
+
+
+=== 
+=== ERROR: Unexpected result of analysis.
+=== 
+=== Please update [WHITE_LIST] in $testFileName
+=== 
+""";
+
+  void onCompletion(_) {
+    bool result = handler.checkResults();
+    if (!result) {
+      print(MESSAGE);
+      exit(1);
+    }
+  }
   if (analyzeAll) {
     compiler.librariesToAnalyzeWhenRun = uriList;
-    return compiler.run(null).then((_) {
-      handler.checkResults();
-    });
+    return compiler.run(null).then(onCompletion);
   } else {
-    return compiler.run(uriList.single).then((_) {
-      handler.checkResults();
-    });
+    return compiler.run(uriList.single).then(onCompletion);
   }
 }