Handle mixed in members

tests/compiler/dart2js/serialization/test_helper.dart

 // Copyright (c) 2016, 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 dart2js.serialization_test_helper;
 
 import 'dart:collection';
 import 'package:compiler/src/common/resolution.dart';
 import 'package:compiler/src/constants/expressions.dart';
 import 'package:compiler/src/constants/values.dart';
@@ skipping 657 matching lines @@
           return strategy.test(a, b, 'name', a.name, b.name) &&
               strategy.testElements(
                   a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass);
         }
         return false;
       case ElementKind.CLASS:
         if (b is KClass) {
           List<InterfaceType> aMixinTypes = [];
           List<InterfaceType> bMixinTypes = [];
           ClassElement aClass = a;
-          while (aClass.isMixinApplication) {
-            MixinApplicationElement aMixinApplication = aClass;
-            aMixinTypes.add(aMixinApplication.mixinType);
-            aClass = aMixinApplication.superclass;
-          }
-          KClass bClass = b;
-          while (bClass != null) {
-            InterfaceType mixinType = testing.getMixinTypeForClass(bClass);
-            if (mixinType == null) break;
-            bMixinTypes.add(mixinType);
-            bClass = testing.getSuperclassForClass(bClass);
-          }
-          if (aMixinTypes.isNotEmpty || aMixinTypes.isNotEmpty) {
-            if (aClass.isNamedMixinApplication &&
-                !strategy.test(a, b, 'name', a.name, b.name)) {
+          if (aClass.isUnnamedMixinApplication) {
+            if (!testing.isUnnamedMixinApplication(b)) {
               return false;
             }
-            Pair<ClassEntity, ClassEntity> pair =
-                new Pair<ClassEntity, ClassEntity>(aClass, bClass);
-            if (assumedMixinApplications.contains(pair)) {
-              return true;
-            } else {
-              assumedMixinApplications.add(pair);
-              bool result = strategy.testTypeLists(
-                  a, b, 'mixinTypes', aMixinTypes, bMixinTypes);
-              assumedMixinApplications.remove(pair);
-              return result;
+            while (aClass.isMixinApplication) {
+              MixinApplicationElement aMixinApplication = aClass;
+              aMixinTypes.add(aMixinApplication.mixinType);
+              aClass = aMixinApplication.superclass;
+            }
+            KClass bClass = b;
+            while (bClass != null) {
+              InterfaceType mixinType = testing.getMixinTypeForClass(bClass);
+              if (mixinType == null) break;
+              bMixinTypes.add(mixinType);
+              bClass = testing.getSuperclassForClass(bClass);
+            }
+            if (aMixinTypes.isNotEmpty || aMixinTypes.isNotEmpty) {
+              Pair<ClassEntity, ClassEntity> pair =
+                  new Pair<ClassEntity, ClassEntity>(aClass, bClass);
+              if (assumedMixinApplications.contains(pair)) {
+                return true;
+              } else {
+                assumedMixinApplications.add(pair);
+                bool result = strategy.testTypeLists(
+                    a, b, 'mixinTypes', aMixinTypes, bMixinTypes);
+                assumedMixinApplications.remove(pair);
+                return result;
+              }
+            }
+          } else {
+            if (testing.isUnnamedMixinApplication(b)) {
+              return false;
             }
           }
           return strategy.test(a, b, 'name', a.name, b.name) &&
-              strategy.testElements(
-                  a, b, 'library', a.library, testing.getLibraryForClass(b));
+              strategy.testElements(a, b, 'library', a.library, b.library);
         }
         return false;
       case ElementKind.LIBRARY:
         if (b is KLibrary) {
           LibraryElement libraryA = a;
-          return libraryA.canonicalUri == testing.getLibraryUri(b);
+          return libraryA.canonicalUri == b.canonicalUri;
         }
         return false;
       case ElementKind.FUNCTION:
         if (b is KMethod) {
           if (!strategy.test(a, b, 'name', a.name, b.name)) return false;
           if (b.enclosingClass != null) {
             return strategy.testElements(
                 a, b, 'enclosingClass', a.enclosingClass, b.enclosingClass);
           } else {
             return strategy.testElements(
@@ skipping 95 matching lines @@
               strategy.testTypeLists(a, b, 'namedParameterTypes',
                   aType.namedParameterTypes, b.namedParameterTypes);
         }
         return false;
       default:
         throw new UnsupportedError('Unsupported equivalence: '
             '$a (${a.runtimeType}) vs $b (${b.runtimeType})');
     }
   }
 }