Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Unified Diff: tests/compiler/dart2js/serialization_test.dart

Issue 1811173003: Support per-library serialization. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Updated cf. comments. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/compiler/dart2js/serialization_library_test.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/compiler/dart2js/serialization_test.dart
diff --git a/tests/compiler/dart2js/serialization_test.dart b/tests/compiler/dart2js/serialization_test.dart
index 3522c414ce6c8bc6afe9ec3d71c6d0c8b128eb56..a97d7426dfe4cae1cd61a87686aa8a17b4df1abf 100644
--- a/tests/compiler/dart2js/serialization_test.dart
+++ b/tests/compiler/dart2js/serialization_test.dart
@@ -7,6 +7,7 @@ library dart2js.serialization_test;
import 'dart:io';
import 'memory_compiler.dart';
import 'package:async_helper/async_helper.dart';
+import 'package:compiler/src/commandline_options.dart';
import 'package:compiler/src/constants/constructors.dart';
import 'package:compiler/src/constants/expressions.dart';
import 'package:compiler/src/dart_types.dart';
@@ -47,7 +48,7 @@ main(List<String> arguments) {
}
asyncTest(() async {
CompilationResult result = await runCompiler(
- entryPoint: entryPoint, options: ['--analyze-all']);
+ entryPoint: entryPoint, options: [Flags.analyzeAll]);
Compiler compiler = result.compiler;
testSerialization(compiler.libraryLoader.libraries,
outPath: outPath,
@@ -58,11 +59,11 @@ main(List<String> arguments) {
void testSerialization(Iterable<LibraryElement> libraries1,
{String outPath,
bool prettyPrint}) {
- Serializer serializer = new Serializer(const JsonSerializationEncoder());
+ Serializer serializer = new Serializer();
for (LibraryElement library1 in libraries1) {
serializer.serialize(library1);
}
- String text = serializer.toText();
+ String text = serializer.toText(const JsonSerializationEncoder());
String outText = text;
if (prettyPrint) {
outText = serializer.prettyPrint();
@@ -74,6 +75,7 @@ void testSerialization(Iterable<LibraryElement> libraries1,
}
Deserializer deserializer = new Deserializer.fromText(
+ new DeserializationContext(),
text, const JsonSerializationDecoder());
List<LibraryElement> libraries2 = <LibraryElement>[];
for (LibraryElement library1 in libraries1) {
@@ -86,13 +88,14 @@ void testSerialization(Iterable<LibraryElement> libraries1,
libraries2.add(library2);
}
- Serializer serializer2 = new Serializer(const JsonSerializationEncoder());
+ Serializer serializer2 = new Serializer();
for (LibraryElement library2 in libraries2) {
serializer2.serialize(library2);
}
- String text2 = serializer2.toText();
+ String text2 = serializer2.toText(const JsonSerializationEncoder());
Deserializer deserializer3 = new Deserializer.fromText(
+ new DeserializationContext(),
text2, const JsonSerializationDecoder());
for (LibraryElement library1 in libraries1) {
LibraryElement library2 =
@@ -548,13 +551,28 @@ class ElementPropertyEquivalence extends BaseElementVisitor<dynamic, Element> {
Element member1 = element1.localLookup(name);
Element member2 = element2.localLookup(name);
if (member1 == null) {
- print('Missing member for $member2 in\n ${members1.join('\n ')}');
- continue;
+ // TODO(johnniwinther): Ensure abstract fields are handled correctly.
+ String message =
+ 'Missing member for $member2 in\n ${members1.join('\n ')}';
+ if (member2.isAbstractField) {
+ print(message);
+ continue;
+ } else {
+ throw message;
+ }
}
if (member2 == null) {
- print('Missing member for $member1 in\n ${members2.join('\n ')}');
- continue;
+ // TODO(johnniwinther): Ensure abstract fields are handled correctly.
+ String message =
+ 'Missing member for $member1 in\n ${members2.join('\n ')}';
+ if (member1.isAbstractField) {
+ print(message);
+ continue;
+ } else {
+ throw message;
+ }
}
+ //print('Checking member ${member1} against ${member2}');
visit(member1, member2);
}
}
@@ -621,6 +639,15 @@ class ElementPropertyEquivalence extends BaseElementVisitor<dynamic, Element> {
element1.interfaces.toList(),
element2.interfaces.toList());
+ List<ConstructorElement> getConstructors(ClassElement cls) {
+ return cls.implementation.constructors.map((c) => c.declaration).toList();
+ }
+
+ checkElementLists(
+ element1, element2, 'constructors',
+ getConstructors(element1),
+ getConstructors(element2));
+
visitMembers(element1, element2);
}
« no previous file with comments | « tests/compiler/dart2js/serialization_library_test.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698