Fix summarization of generic redirecting constructors (again).

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 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ skipping 407 matching lines @@
         compareElements(r.element, expectedElement, desc);
         // elementAnnotation should be null; it is only used in the full AST.
         expect(o.elementAnnotation, isNull);
         expect(r.elementAnnotation, isNull);
       } else {
         fail('Not implemented for ${r.runtimeType} vs. ${o.runtimeType}');
       }
     }
   }
 
-  void compareConstructorElements(ConstructorElementImpl resynthesized,
-      ConstructorElementImpl original, String desc) {
+  void compareConstructorElements(ConstructorElement resynthesized,
+      ConstructorElement original, String desc) {
     compareExecutableElements(resynthesized, original, desc);
     if (original.isConst) {
-      compareConstAstLists(resynthesized.constantInitializers,
-          original.constantInitializers, desc);
+      ConstructorElementImpl resynthesizedImpl =
+          getActualElement(resynthesized, desc);
+      ConstructorElementImpl originalImpl = getActualElement(original, desc);
+      compareConstAstLists(resynthesizedImpl.constantInitializers,
+          originalImpl.constantInitializers, desc);
     }
     if (original.redirectedConstructor == null) {
       expect(resynthesized.redirectedConstructor, isNull, reason: desc);
     } else {
-      compareElements(resynthesized.redirectedConstructor,
-          original.redirectedConstructor, desc);
+      compareConstructorElements(resynthesized.redirectedConstructor,
+          original.redirectedConstructor, '$desc redirectedConstructor');
+    }
+    ConstructorElement resynthesizedNonHandle =
+        resynthesized is ConstructorElementHandle
+            ? resynthesized.actualElement
+            : resynthesized;
+    if (original is ConstructorMember) {
+      expect(resynthesizedNonHandle, new isInstanceOf<ConstructorMember>(),
+          reason: desc);
+      if (resynthesizedNonHandle is ConstructorMember) {
+        List<DartType> resynthesizedTypeArguments =
+            resynthesizedNonHandle.definingType.typeArguments;
+        List<DartType> originalTypeArguments =
+            original.definingType.typeArguments;
+        expect(
+            resynthesizedTypeArguments, hasLength(originalTypeArguments.length),
+            reason: desc);
+        for (int i = 0; i < originalTypeArguments.length; i++) {
+          compareTypeImpls(resynthesizedTypeArguments[i],
+              originalTypeArguments[i], '$desc type argument $i');
+        }
+      }
+    } else {
+      expect(
+          resynthesizedNonHandle, isNot(new isInstanceOf<ConstructorMember>()),
+          reason: desc);
     }
   }
 
   void compareElementAnnotations(ElementAnnotationImpl resynthesized,
       ElementAnnotationImpl original, String desc) {
     expect(resynthesized.element, isNotNull, reason: desc);
     expect(resynthesized.element.kind, original.element.kind, reason: desc);
     expect(resynthesized.element.location, original.element.location,
         reason: desc);
     expect(resynthesized.compilationUnit, isNotNull, reason: desc);
@@ skipping 2786 matching lines @@
       fail('Unexpectedly tried to get unlinked summary for $uri');
     }
     return serializedUnit;
   }
 
   @override
   bool hasLibrarySummary(String uri) {
     return true;
   }
 }