| Index: tests/compiler/dart2js/serialization_test.dart
|
| diff --git a/tests/compiler/dart2js/serialization_test.dart b/tests/compiler/dart2js/serialization_test.dart
|
| index c913a3cf5ad7daa3e60dc60c9fff62a35f73ee93..669d8871621fa9b30b14a4c43e745b2b96b48eeb 100644
|
| --- a/tests/compiler/dart2js/serialization_test.dart
|
| +++ b/tests/compiler/dart2js/serialization_test.dart
|
| @@ -15,9 +15,9 @@ import 'package:compiler/src/diagnostics/invariant.dart';
|
| import 'package:compiler/src/elements/elements.dart';
|
| import 'package:compiler/src/elements/visitor.dart';
|
| import 'package:compiler/src/ordered_typeset.dart';
|
| -import 'package:compiler/src/serialization/serialization.dart';
|
| +import 'package:compiler/src/serialization/element_serialization.dart';
|
| import 'package:compiler/src/serialization/json_serializer.dart';
|
| -import 'package:compiler/src/tree/tree.dart';
|
| +import 'package:compiler/src/serialization/serialization.dart';
|
|
|
| main(List<String> arguments) {
|
| // Ensure that we can print out constant expressions.
|
| @@ -472,41 +472,28 @@ class ElementPropertyEquivalence extends BaseElementVisitor<dynamic, Element> {
|
| element1.libraryName, element2.libraryName);
|
| visitMembers(element1, element2);
|
| visit(element1.entryCompilationUnit, element2.entryCompilationUnit);
|
| +
|
| checkElementLists(
|
| element1, element2, 'compilationUnits',
|
| - element1.compilationUnits.toList(),
|
| - element2.compilationUnits.toList());
|
| + LibrarySerializer.getCompilationUnits(element1),
|
| + LibrarySerializer.getCompilationUnits(element2));
|
|
|
| checkElementListIdentities(
|
| - element1, element2, 'imports', element1.imports, element2.imports);
|
| + element1, element2, 'imports',
|
| + LibrarySerializer.getImports(element1),
|
| + LibrarySerializer.getImports(element2));
|
| checkElementListIdentities(
|
| element1, element2, 'exports', element1.exports, element2.exports);
|
|
|
| - List<Element> imports1 = <Element>[];
|
| - List<Element> imports2 = <Element>[];
|
| - element1.forEachImport((Element import) {
|
| - if (import.isAmbiguous) return;
|
| - imports1.add(import);
|
| - });
|
| - element2.forEachImport((Element import) {
|
| - if (import.isAmbiguous) return;
|
| - imports2.add(import);
|
| - });
|
| checkElementListIdentities(
|
| - element1, element2, 'importScope', imports1, imports2);
|
| + element1, element2, 'importScope',
|
| + LibrarySerializer.getImportedElements(element1),
|
| + LibrarySerializer.getImportedElements(element2));
|
|
|
| - List<Element> exports1 = <Element>[];
|
| - List<Element> exports2 = <Element>[];
|
| - element1.forEachExport((Element export) {
|
| - if (export.isAmbiguous) return;
|
| - exports1.add(export);
|
| - });
|
| - element2.forEachExport((Element export) {
|
| - if (export.isAmbiguous) return;
|
| - exports2.add(export);
|
| - });
|
| checkElementListIdentities(
|
| - element1, element2, 'exportScope', exports1, exports2);
|
| + element1, element2, 'exportScope',
|
| + LibrarySerializer.getExportedElements(element1),
|
| + LibrarySerializer.getExportedElements(element2));
|
| }
|
|
|
| @override
|
| @@ -576,6 +563,16 @@ class ElementPropertyEquivalence extends BaseElementVisitor<dynamic, Element> {
|
| element1.typeVariables, element2.typeVariables);
|
| check(element1, element2, 'isAbstract',
|
| element1.isAbstract, element2.isAbstract);
|
| + check(element1, element2, 'isUnnamedMixinApplication',
|
| + element1.isUnnamedMixinApplication, element2.isUnnamedMixinApplication);
|
| + check(element1, element2, 'isEnumClass',
|
| + element1.isEnumClass, element2.isEnumClass);
|
| + if (element1.isEnumClass) {
|
| + EnumClassElement enum1 = element1;
|
| + EnumClassElement enum2 = element2;
|
| + checkElementLists(enum1, enum2, 'enumValues',
|
| + enum1.enumValues, enum2.enumValues);
|
| + }
|
| if (!element1.isObject) {
|
| checkTypes(element1, element2, 'supertype',
|
| element1.supertype, element2.supertype);
|
|
|