Compute exportNamespace during resynthesizing.

pkg/analyzer/test/src/summary/resynthesize_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 test.src.serialization.elements_test;
 
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/resolver.dart' show Namespace;
 import 'package:analyzer/src/generated/source.dart';
@@ skipping 15 matching lines @@
   Set<Source> otherLibrarySources = new Set<Source>();
 
   void addLibrary(String uri) {
     otherLibrarySources.add(analysisContext2.sourceFactory.forUri(uri));
   }
 
   void addLibrarySource(String filePath, String contents) {
     otherLibrarySources.add(addNamedSource(filePath, contents));
   }
 
-  void checkLibrary(String text, {bool allowErrors: false}) {
+  void checkLibrary(String text,
+      {bool allowErrors: false, int resynthesisCount: 1}) {
     Source source = addSource(text);
     LibraryElementImpl original = resolve2(source);
-    LibraryElementImpl resynthesized =
-        resynthesizeLibrary(source, original, allowErrors);
+    LibraryElementImpl resynthesized = resynthesizeLibrary(
+        source, original, allowErrors,
+        resynthesisCount: resynthesisCount);
     checkLibraryElements(original, resynthesized);
   }
 
   void checkLibraryElements(
       LibraryElementImpl original, LibraryElementImpl resynthesized) {
     compareElements(resynthesized, original, '(library)');
     expect(resynthesized.displayName, original.displayName);
     expect(original.enclosingElement, isNull);
     expect(resynthesized.enclosingElement, isNull);
     compareCompilationUnitElements(resynthesized.definingCompilationUnit,
@@ skipping 15 matching lines @@
     expect(resynthesized.nameLength, original.nameLength);
     if (original.entryPoint == null) {
       expect(resynthesized.entryPoint, isNull);
     } else {
       expect(resynthesized.entryPoint, isNotNull);
       compareFunctionElements(
           resynthesized.entryPoint, original.entryPoint, '(entry point)');
     }
     compareNamespaces(resynthesized.publicNamespace, original.publicNamespace,
         '(public namespace)');
-    // TODO(paulberry): test exportNamespace and metadata.
+    compareNamespaces(resynthesized.exportNamespace, original.exportNamespace,
+        '(export namespace)');
+    // TODO(paulberry): test metadata.
   }
 
   void compareClassElements(
       ClassElementImpl resynthesized, ClassElementImpl original, String desc) {
     compareElements(resynthesized, original, desc);
     expect(resynthesized.fields.length, original.fields.length,
         reason: '$desc fields.length');
     for (int i = 0; i < resynthesized.fields.length; i++) {
       String name = original.fields[i].name;
       compareFieldElements(resynthesized.getField(name), original.fields[i],
@@ skipping 388 matching lines @@
     expect(resynthesized.uriEnd, original.uriEnd, reason: desc);
   }
 
   void compareVariableElements(VariableElementImpl resynthesized,
       VariableElementImpl original, String desc) {
     compareElements(resynthesized, original, desc);
     compareTypes(resynthesized.type, original.type, desc);
     // TODO(paulberry): test initializer
   }
 
-  fail_function_entry_point_in_export() {
-    addLibrarySource('/a.dart', 'library a; main() {}');
-    checkLibrary('export "a.dart";');
-  }
-
   LibraryElementImpl resynthesizeLibrary(
-      Source source, LibraryElementImpl original, bool allowErrors) {
+      Source source, LibraryElementImpl original, bool allowErrors,
+      {int resynthesisCount: 1}) {
     if (!allowErrors) {
       assertNoErrors(source);
     }
     String uri = source.uri.toString();
     addLibrary('dart:core');
-    return resynthesizeLibraryElement(uri, original);
+    return resynthesizeLibraryElement(uri, original,
+        resynthesisCount: resynthesisCount);
   }
 
   LibraryElementImpl resynthesizeLibraryElement(
-      String uri, LibraryElementImpl original) {
+      String uri, LibraryElementImpl original,
+      {int resynthesisCount: 1}) {
     Map<String, UnlinkedUnit> unlinkedSummaries = <String, UnlinkedUnit>{};
     PrelinkedLibrary getPrelinkedSummaryFor(LibraryElement lib) {
       LibrarySerializationResult serialized =
           serializeLibrary(lib, typeProvider);
       for (int i = 0; i < serialized.unlinkedUnits.length; i++) {
         unlinkedSummaries[serialized.unitUris[i]] =
             new UnlinkedUnit.fromBuffer(serialized.unlinkedUnits[i].toBuffer());
       }
       return new PrelinkedLibrary.fromBuffer(serialized.prelinked.toBuffer());
     }
@@ skipping 20 matching lines @@
     }
     SummaryResynthesizer resynthesizer = new SummaryResynthesizer(
         analysisContext,
         analysisContext.typeProvider,
         getPrelinkedSummary,
         getUnlinkedSummary,
         analysisContext.sourceFactory);
     LibraryElementImpl resynthesized = resynthesizer.getLibraryElement(uri);
     // Check that no other summaries needed to be resynthesized to resynthesize
     // the library element.
-    expect(resynthesizer.resynthesisCount, 1);
+    expect(resynthesizer.resynthesisCount, resynthesisCount);

[Paul Berry, 2016/01/11 23:33:41]

Please add:

// TODO(paulberry): once export namespaces are resynthesized from prelinked
data, resynthesisCount should be hardcoded to 1.

     return resynthesized;
   }
 
   test_class_alias() {
     checkLibrary('class C = D with E, F; class D {} class E {} class F {}');
   }
 
   test_class_alias_documented() {
     checkLibrary('''
 // Extra comment so doc comment offset != 0
@@ skipping 313 matching lines @@
   test_enum_values() {
     checkLibrary('enum E { v1, v2 }');
   }
 
   test_enums() {
     checkLibrary('enum E1 { v1 } enum E2 { v2 }');
   }
 
   test_export_hide() {
     addLibrary('dart:async');
-    checkLibrary('export "dart:async" hide Stream, Future;');
+    checkLibrary('export "dart:async" hide Stream, Future;',
+        resynthesisCount: 2);
   }
 
   test_export_multiple_combinators() {
     addLibrary('dart:async');
-    checkLibrary('export "dart:async" hide Stream show Future;');
+    checkLibrary('export "dart:async" hide Stream show Future;',
+        resynthesisCount: 2);
   }
 
   test_export_show() {
     addLibrary('dart:async');
-    checkLibrary('export "dart:async" show Future, Stream;');
+    checkLibrary('export "dart:async" show Future, Stream;',
+        resynthesisCount: 2);
   }
 
   test_exports() {
     addLibrarySource('/a.dart', 'library a;');
     addLibrarySource('/b.dart', 'library b;');
-    checkLibrary('export "a.dart"; export "b.dart";');
+    checkLibrary('export "a.dart"; export "b.dart";', resynthesisCount: 3);
   }
 
   test_field_documented() {
     checkLibrary('''
 class C {
   /**
    * Docs
    */
   var x;
 }''');
   }
 
   test_function_documented() {
     checkLibrary('''
 // Extra comment so doc comment offset != 0
 /**
  * Docs
  */
 f() {}''');
   }
 
   test_function_entry_point() {
     checkLibrary('main() {}');
   }
 
+  test_function_entry_point_in_export() {
+    addLibrarySource('/a.dart', 'library a; main() {}');
+    checkLibrary('export "a.dart";', resynthesisCount: 2);
+  }
+
   test_function_entry_point_in_export_hidden() {
     addLibrarySource('/a.dart', 'library a; main() {}');
-    checkLibrary('export "a.dart" hide main;');
+    checkLibrary('export "a.dart" hide main;', resynthesisCount: 2);
   }
 
   test_function_entry_point_in_part() {
     addNamedSource('/a.dart', 'part of my.lib; main() {}');
     checkLibrary('library my.lib; part "a.dart";');
   }
 
   test_function_external() {
     checkLibrary('external f();');
   }
@@ skipping 439 matching lines @@
   }
 
   test_variable_implicit_type() {
     checkLibrary('var x;');
   }
 
   test_variables() {
     checkLibrary('int i; int j;');
   }
 }