Add equivalence check of NativeData and InterceptorData

tests/compiler/dart2js/serialization/model_test_helper.dart

Index: tests/compiler/dart2js/serialization/model_test_helper.dart
diff --git a/tests/compiler/dart2js/serialization/model_test_helper.dart b/tests/compiler/dart2js/serialization/model_test_helper.dart
index ab2f0aa825ee8099974ce7c21ddc7cba005ff58a..3441b56b5c632fea3f505db0e441b3f92a1763a7 100644
--- a/tests/compiler/dart2js/serialization/model_test_helper.dart
+++ b/tests/compiler/dart2js/serialization/model_test_helper.dart
@@ -22,6 +22,8 @@ import 'package:compiler/src/enqueue.dart';
 import 'package:compiler/src/filenames.dart';
 import 'package:compiler/src/js_backend/js_backend.dart';
 import 'package:compiler/src/js_backend/backend_usage.dart';
+import 'package:compiler/src/js_backend/native_data.dart';
+import 'package:compiler/src/js_backend/interceptor_data.dart';
 import 'package:compiler/src/serialization/equivalence.dart';
 import 'package:compiler/src/tree/nodes.dart';
 import 'package:compiler/src/universe/class_set.dart';
@@ -107,7 +109,8 @@ Future checkModels(Uri entryPoint,
     checkClosedWorlds(
         compilerNormal.resolutionWorldBuilder.closedWorldForTesting,
         compilerDeserialized.resolutionWorldBuilder.closedWorldForTesting,
-        areElementsEquivalent,
+        // Serialized native data include non-live members.
+        allowExtra: true,
         verbose: verbose);
     checkBackendInfo(compilerNormal, compilerDeserialized, verbose: verbose);
   });
@@ -172,8 +175,9 @@ void checkResolutionEnqueuers(
 }
 
 void checkClosedWorlds(ClosedWorld closedWorld1, ClosedWorld closedWorld2,
-    bool elementEquivalence(Entity a, Entity b),
-    {bool verbose: false}) {
+    {TestStrategy strategy: const TestStrategy(),
+    bool allowExtra: false,
+    bool verbose: false}) {
   if (verbose) {
     print(closedWorld1.dump());
     print(closedWorld2.dump());
@@ -185,8 +189,112 @@ void checkClosedWorlds(ClosedWorld closedWorld1, ClosedWorld closedWorld2,
           .getClassHierarchyNode(closedWorld1.commonElements.objectClass),
       closedWorld2
           .getClassHierarchyNode(closedWorld2.commonElements.objectClass),
-      elementEquivalence,
+      strategy.elementEquivalence,
       verbose: verbose);
+
+  checkNativeData(closedWorld1.nativeData, closedWorld2.nativeData,
+      strategy: strategy, allowExtra: allowExtra, verbose: verbose);
+  checkInterceptorData(closedWorld1.interceptorData,
+      closedWorld2.interceptorData, strategy.elementEquivalence,
+      verbose: verbose);
+}
+
+void checkNativeData(NativeDataImpl data1, NativeDataImpl data2,
+    {TestStrategy strategy: const TestStrategy(),
+    bool allowExtra: false,
+    bool verbose: false}) {
+  checkMapEquivalence(data1, data2, 'nativeMemberName', data1.nativeMemberName,
+      data2.nativeMemberName, strategy.elementEquivalence, equality,
+      allowExtra: allowExtra);
+
+  checkMapEquivalence(
+      data1,
+      data2,
+      'nativeMethodBehavior',
+      data1.nativeMethodBehavior,
+      data2.nativeMethodBehavior,

[Siggi Cherem (dart-lang), 2017/05/10 16:50:05]

not for this CL, but I keep trying to think of ways in which we can make all of
these "check" functions easier to maintain. Probably not worthwhile?

Here are some ideas:
 1. avoid the duplication with data1 and data2, for example, maybe we can write
the field as a closure:

   checkMapEquivalence(
       data1,
       data2,
      'nativeMethodBehavior',
      (d) => d.nativeMethodBehaviod,
       ...)

 2. create some kind of descriptor for the data that you are checking, and
provide all equivalence functions once with that descriptor? For example:

  var descriptor = new Descritor('native-data')
     ..mapCheck(
         'nativeMethodBehavior',
         (d) => d.nativeMethodBehavior.
         keysType: Entity,
         valuesType: NativeBehavior),
     ..mapCheck(
         'nativeFieldLoadBehavior',
         (d) => d.nativeFieldLoadBehavior));


  runChecks(descriptor, data1, data2, {
     Entity: strategy.elementEquivalence,
     NativeBehavior: testNativeBehavior
  });

 3. even further - we could use mirrors or a code generator to make this more
succinct. With mirrors we would declare this descriptor using metadata, for
example:

   class NativeDataEquivalenceChecks extends EquivalenceChecks {
      NativeData data;
      NativeDataEquivalenceChecks(this.data);

      @Check.map(Entity, NativeBehavior)
      get nativeMethodBehavior => data.nativeMethodBehavior;

      @Check.set(Entity)
      get anonymousJsInteropClasses => data.jsInteropClasses;

      ..
   }

[Johnni Winther, 2017/05/11 12:01:32]

Acknowledged.

+      strategy.elementEquivalence,
+      (a, b) => testNativeBehavior(a, b, strategy: strategy),
+      allowExtra: allowExtra);
+
+  checkMapEquivalence(
+      data1,
+      data2,
+      'nativeFieldLoadBehavior',
+      data1.nativeFieldLoadBehavior,
+      data2.nativeFieldLoadBehavior,
+      strategy.elementEquivalence,
+      (a, b) => testNativeBehavior(a, b, strategy: strategy),
+      allowExtra: allowExtra);
+
+  checkMapEquivalence(
+      data1,
+      data2,
+      'nativeFieldStoreBehavior',
+      data1.nativeFieldStoreBehavior,
+      data2.nativeFieldStoreBehavior,
+      strategy.elementEquivalence,
+      (a, b) => testNativeBehavior(a, b, strategy: strategy),
+      allowExtra: allowExtra);
+
+  checkMapEquivalence(
+      data1,
+      data2,
+      'jsInteropLibraryNames',
+      data1.jsInteropLibraryNames,
+      data2.jsInteropLibraryNames,
+      strategy.elementEquivalence,
+      equality);
+
+  checkSetEquivalence(
+      data1,
+      data2,
+      'anonymousJsInteropClasses',
+      data1.anonymousJsInteropClasses,
+      data2.anonymousJsInteropClasses,
+      strategy.elementEquivalence);
+
+  checkMapEquivalence(
+      data1,
+      data2,
+      'jsInteropClassNames',
+      data1.jsInteropClassNames,
+      data2.jsInteropClassNames,
+      strategy.elementEquivalence,
+      equality);
+
+  checkMapEquivalence(
+      data1,
+      data2,
+      'jsInteropMemberNames',
+      data1.jsInteropMemberNames,
+      data2.jsInteropMemberNames,
+      strategy.elementEquivalence,
+      equality);
+}
+
+void checkInterceptorData(InterceptorDataImpl data1, InterceptorDataImpl data2,
+    bool elementEquivalence(Entity a, Entity b),
+    {bool verbose: false}) {
+  checkMapEquivalence(
+      data1,
+      data2,
+      'interceptedElements',
+      data1.interceptedElementsForTesting,
+      data2.interceptedElementsForTesting,
+      equality,
+      (a, b) => areSetsEquivalent(a, b, elementEquivalence));
+
+  checkSetEquivalence(data1, data2, 'interceptedClasses',
+      data1.interceptedClasses, data2.interceptedClasses, elementEquivalence);
+
+  checkSetEquivalence(
+      data1,
+      data2,
+      'classesMixedIntoInterceptedClasses',
+      data1.classesMixedIntoInterceptedClassesForTesting,
+      data2.classesMixedIntoInterceptedClassesForTesting,
+      elementEquivalence);
 }
 
 void checkBackendInfo(Compiler compilerNormal, Compiler compilerDeserialized,