Fix analyze_dart2js_helpers_test

tests/compiler/dart2js/analyze_dart2js_helpers_test.dart

 // Copyright (c) 2015, 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 dart2js.analyze_helpers.test;
 
 import 'dart:io';
 
 import 'package:async_helper/async_helper.dart';
 import 'package:compiler/compiler_new.dart' show
@@ skipping 30 matching lines @@
     Flags.analyzeMain,
     '--categories=Client,Server'];
   if (verbose) {
     options.add(Flags.verbose);
   }
   asyncTest(() async {
     CompilerImpl compiler = compilerFor(
         options: options, showDiagnostics: verbose);
     FormattingDiagnosticHandler diagnostics =
         new FormattingDiagnosticHandler(compiler.provider);
-    HelperAnalyzer analyzer = new HelperAnalyzer(diagnostics);
     Directory dir =
         new Directory.fromUri(Uri.base.resolve('pkg/compiler/lib/'));
+    String helpersUriPrefix = dir.uri.resolve('src/helpers/').toString();
+    HelperAnalyzer analyzer = new HelperAnalyzer(diagnostics, helpersUriPrefix);
+    LibraryElement helperLibrary;
     for (FileSystemEntity entity in dir.listSync(recursive: true)) {
       if (entity is File && entity.path.endsWith('.dart')) {
         Uri file = Uri.base.resolve(nativeToUriPath(entity.path));
         if (verbose) {
           print('---- analyzing $file ----');
         }
         LibraryElement library = await compiler.analyzeUri(file);
         if (library != null) {
+          if (library.libraryName == 'dart2js.helpers') {
+            helperLibrary = library;
+          }
           library.forEachLocalMember((Element element) {
             if (element is ClassElement) {
               element.forEachLocalMember((AstElement member) {
                 analyzer.analyze(member.resolvedAst);
               });
             } else if (element is MemberElement) {
               analyzer.analyze(element.resolvedAst);
             }
           });
         }
       }
     }
+    Expect.isNotNull(helperLibrary, 'Helper library not found');
+    Expect.isTrue(analyzer.isHelper(helperLibrary),
+        "Helper library $helperLibrary is not considered a helper.");
     Expect.isTrue(analyzer.errors.isEmpty, "Errors found.");
   });
 }
 
 class HelperAnalyzer extends TraversalVisitor {
   final FormattingDiagnosticHandler diagnostics;
+  final String helpersUriPrefix;
   List<SourceSpan> errors = <SourceSpan>[];
 
   ResolvedAst resolvedAst;
 
   @override
   TreeElements get elements => resolvedAst.elements;
 
   AnalyzableElement get analyzedElement => resolvedAst.element;
 
-  HelperAnalyzer(this.diagnostics) : super(null);
+  HelperAnalyzer(this.diagnostics, this.helpersUriPrefix) : super(null);
 
   @override
   void apply(Node node, [_]) {
     node.accept(this);
   }
 
   void analyze(ResolvedAst resolvedAst) {
     if (resolvedAst.kind != ResolvedAstKind.PARSED) {
       // Skip synthesized members.
       return;
     }
     this.resolvedAst = resolvedAst;
     apply(resolvedAst.node);
     this.resolvedAst = null;
   }
 
   bool isHelper(Element element) {
     Uri uri = element.library.canonicalUri;
-    return '$uri'.startsWith('package:compiler/src/helpers/');

[Johnni Winther, 2016/05/26 12:13:21]

With the change to use `compiler.analyzeUri` some time ago, the uri changed from
'package:compiler...' to 'file:///...'.

+    return '$uri'.startsWith(helpersUriPrefix);
   }
 
   void checkAccess(Node node, MemberElement element) {
     if (isHelper(element) && !isHelper(analyzedElement)) {
       Uri uri = analyzedElement.implementation.sourcePosition.uri;
       SourceSpan span = new SourceSpan.fromNode(uri, node);
       diagnostics.report(null, span.uri, span.begin, span.end,
           "Helper used in production code.",
           Diagnostic.ERROR);
       errors.add(span);
@@ skipping 108 matching lines @@
   }
 
   @override
   void visitConstConstructorInvoke(
       NewExpression node,
       ConstructedConstantExpression constant,
       _) {
     checkAccess(node, constant.target);
   }
 }