Fixes to mock SDK to enable dart:core to be summarized.

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/source.dart';
 import 'package:analyzer/src/summary/builder.dart';
 import 'package:analyzer/src/summary/format.dart';
@@ skipping 51 matching lines @@
       compareExportElements(resynthesized.exports[i], original.exports[i],
           'export ${original.exports[i].name}');
     }
     // TODO(paulberry): test entryPoint, exportNamespace, publicNamespace,
     // and metadata.
   }
 
   void compareClassElements(
       ClassElementImpl resynthesized, ClassElementImpl original, String desc) {
     compareElements(resynthesized, original, desc);
-    expect(resynthesized.fields.length, original.fields.length);
+    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], '$desc.$name');
+      compareFieldElements(resynthesized.getField(name), original.fields[i],
+          '$desc.field $name');
     }
     compareTypes(
         resynthesized.supertype, original.supertype, '$desc supertype');
     expect(resynthesized.interfaces.length, original.interfaces.length);
     for (int i = 0; i < resynthesized.interfaces.length; i++) {
       compareTypes(resynthesized.interfaces[i], original.interfaces[i],
           '$desc interface ${original.interfaces[i].name}');
     }
     expect(resynthesized.mixins.length, original.mixins.length);
     for (int i = 0; i < resynthesized.mixins.length; i++) {
@@ skipping 79 matching lines @@
   void compareConstructorElements(ConstructorElementImpl resynthesized,
       ConstructorElementImpl original, String desc) {
     compareExecutableElements(resynthesized, original, desc);
     // TODO(paulberry): test redirectedConstructor and constantInitializers
   }
 
   void compareElements(
       ElementImpl resynthesized, ElementImpl original, String desc) {
     expect(resynthesized, isNotNull);
     expect(resynthesized.kind, original.kind);
-    expect(resynthesized.location, original.location);
+    expect(resynthesized.location, original.location, reason: desc);
     expect(resynthesized.name, original.name);
     for (Modifier modifier in Modifier.values) {
       if (modifier == Modifier.MIXIN) {
         // Skipping for now.  TODO(paulberry): fix.
         continue;
       }
       bool got = resynthesized.hasModifier(modifier);
       bool want = original.hasModifier(modifier);
       expect(got, want,
           reason: 'Mismatch in $desc.$modifier: got $got, want $want');
@@ skipping 168 matching lines @@
 
   void compareTypeParameterElements(TypeParameterElementImpl resynthesized,
       TypeParameterElementImpl original, String desc) {
     compareElements(resynthesized, original, desc);
     compareTypes(resynthesized.type, original.type, desc);
     compareTypes(resynthesized.bound, original.bound, '$desc bound');
   }
 
   void compareTypes(DartType resynthesized, DartType original, String desc) {
     if (original == null) {
-      expect(resynthesized, isNull);
+      expect(resynthesized, isNull, reason: desc);
     } else if (resynthesized is InterfaceTypeImpl &&
         original is InterfaceTypeImpl) {
       compareTypeImpls(resynthesized, original);
       expect(resynthesized.typeArguments.length, original.typeArguments.length);
       for (int i = 0; i < resynthesized.typeArguments.length; i++) {
         compareTypes(resynthesized.typeArguments[i], original.typeArguments[i],
             '$desc type argument ${original.typeArguments[i].name}');
       }
     } else if (resynthesized is TypeParameterTypeImpl &&
         original is TypeParameterTypeImpl) {
@@ skipping 33 matching lines @@
     expect(resynthesized.uri, original.uri);
   }
 
   void compareVariableElements(VariableElementImpl resynthesized,
       VariableElementImpl original, String desc) {
     compareElements(resynthesized, original, desc);
     compareTypes(resynthesized.type, original.type, desc);
     // TODO(paulberry): test initializer
   }
 
-  fail_core() {
-    // TODO(paulberry): figure out why this test is failing.  It's possible
-    // some of the elements in the core library fail to resynthesize properly
-    // because of flaws in the mock SDK; it's also possible that there are bugs
-    // in the summary logic which are not caught by other tests.
-    String uri = 'dart:core';
-    LibraryElementImpl original =
-        resolve2(analysisContext2.sourceFactory.forUri(uri));
-    LibraryElementImpl resynthesized =
-        resynthesizeLibraryElement(uri, original);
-    checkLibraryElements(original, resynthesized);
-  }
-
   PrelinkedLibrary getSummaryFor(LibraryElement lib) {
     BuilderContext ctx = new BuilderContext();
     List<int> summary = serializeLibrary(ctx, lib, typeProvider).toBuffer();
     return new PrelinkedLibrary.fromBuffer(summary);
   }
 
   LibraryElementImpl resynthesizeLibrary(
       Source source, LibraryElementImpl original, bool allowErrors) {
     if (!allowErrors) {
       assertNoErrors(source);
@@ skipping 208 matching lines @@
   }
 
   test_class_type_parameters_f_bound_simple() {
     checkLibrary('class C<T extends U, U> {}');
   }
 
   test_classes() {
     checkLibrary('class C {} class D {}');
   }
 
+  test_core() {
+    String uri = 'dart:core';
+    LibraryElementImpl original =
+        resolve2(analysisContext2.sourceFactory.forUri(uri));
+    LibraryElementImpl resynthesized =
+        resynthesizeLibraryElement(uri, original);
+    checkLibraryElements(original, resynthesized);
+  }
+
   test_enum_values() {
     checkLibrary('enum E { v1, v2 }');
   }
 
   test_enums() {
     checkLibrary('enum E1 { v1 } enum E2 { v2 }');
   }
 
   test_export_hide() {
     addLibrary('dart:async');
@@ skipping 350 matching lines @@
   }
 
   test_variable_const() {
     checkLibrary('const int i = 0;');
   }
 
   test_variables() {
     checkLibrary('int i; int j;');
   }
 }