Compare variable initializers as functions, skip the return type.

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 530 matching lines @@
           reason: 'Mismatch in $desc.$modifier: got $got, want $want');
     }
     // Validate members.
     if (oImpl is Member) {
       expect(rImpl, new isInstanceOf<Member>(), reason: desc);
     } else {
       expect(rImpl, isNot(new isInstanceOf<Member>()), reason: desc);
     }
   }
 
-  void compareExecutableElements(ExecutableElement resynthesized,
-      ExecutableElement original, String desc) {
+  void compareExecutableElements(
+      ExecutableElement resynthesized, ExecutableElement original, String desc,
+      {bool compareReturnTypes: true}) {
     compareElements(resynthesized, original, desc);
-    expect(resynthesized.parameters.length, original.parameters.length);
-    for (int i = 0; i < resynthesized.parameters.length; i++) {
-      compareParameterElements(
-          resynthesized.parameters[i],
-          original.parameters[i],
-          '$desc parameter ${original.parameters[i].name}');
+    compareParameterElementLists(
+        resynthesized.parameters, original.parameters, desc);
+    // TODO(scheglov) remove the condition once initializers have return types.
+    if (compareReturnTypes) {
+      compareTypes(
+          resynthesized.returnType, original.returnType, '$desc return type');
     }
-    compareTypes(
-        resynthesized.returnType, original.returnType, '$desc return type');
     compareTypes(resynthesized.type, original.type, desc);
     expect(resynthesized.typeParameters.length, original.typeParameters.length);
     for (int i = 0; i < resynthesized.typeParameters.length; i++) {
       compareTypeParameterElements(
           resynthesized.typeParameters[i],
           original.typeParameters[i],
           '$desc type parameter ${original.typeParameters[i].name}');
     }
     if (original is! Member) {
       List<FunctionElement> rFunctions = resynthesized.functions;
@@ skipping 26 matching lines @@
           resynthesized.combinators[i], original.combinators[i]);
     }
   }
 
   void compareFieldElements(
       FieldElementImpl resynthesized, FieldElementImpl original, String desc) {
     comparePropertyInducingElements(resynthesized, original, desc);
   }
 
   void compareFunctionElements(
-      FunctionElement resynthesized, FunctionElement original, String desc) {
-    compareExecutableElements(resynthesized, original, desc);
+      FunctionElement resynthesized, FunctionElement original, String desc,
+      {bool compareReturnTypes: true}) {
+    if (original == null && resynthesized == null) {
+      return;
+    }
+    expect(resynthesized, isNotNull, reason: desc);
+    compareExecutableElements(resynthesized, original, desc,
+        compareReturnTypes: compareReturnTypes);
     checkPossibleLocalElements(resynthesized, original);
   }
 
   void compareFunctionTypeAliasElements(
       FunctionTypeAliasElementImpl resynthesized,
       FunctionTypeAliasElementImpl original,
       String desc) {
     compareElements(resynthesized, original, desc);
-    expect(resynthesized.parameters.length, original.parameters.length);
-    for (int i = 0; i < resynthesized.parameters.length; i++) {
-      compareParameterElements(
-          resynthesized.parameters[i],
-          original.parameters[i],
-          '$desc parameter ${original.parameters[i].name}');
-    }
+    compareParameterElementLists(
+        resynthesized.parameters, original.parameters, desc);
     compareTypes(
         resynthesized.returnType, original.returnType, '$desc return type');
     compareTypes(resynthesized.type, original.type, desc);
     expect(resynthesized.typeParameters.length, original.typeParameters.length);
     for (int i = 0; i < resynthesized.typeParameters.length; i++) {
       compareTypeParameterElements(
           resynthesized.typeParameters[i],
           original.typeParameters[i],
           '$desc type parameter ${original.typeParameters[i].name}');
     }
@@ skipping 56 matching lines @@
     Map<String, Element> originalMap = original.definedNames;
     expect(resynthesizedMap.keys.toSet(), originalMap.keys.toSet(),
         reason: desc);
     for (String key in originalMap.keys) {
       Element resynthesizedElement = resynthesizedMap[key];
       Element originalElement = originalMap[key];
       compareElements(resynthesizedElement, originalElement, key);
     }
   }
 
+  void compareParameterElementLists(
+      List<ParameterElement> resynthesizedParameters,
+      List<ParameterElement> originalParameters,
+      String desc) {
+    expect(resynthesizedParameters.length, originalParameters.length);
+    for (int i = 0; i < resynthesizedParameters.length; i++) {
+      compareParameterElements(
+          resynthesizedParameters[i],
+          originalParameters[i],
+          '$desc parameter ${originalParameters[i].name}');
+    }
+  }
+
   void compareParameterElements(
       ParameterElement resynthesized, ParameterElement original, String desc) {
     compareVariableElements(resynthesized, original, desc);
-    expect(resynthesized.parameters.length, original.parameters.length);
-    for (int i = 0; i < resynthesized.parameters.length; i++) {
-      compareParameterElements(
-          resynthesized.parameters[i],
-          original.parameters[i],
-          '$desc parameter ${original.parameters[i].name}');
-    }
+    compareParameterElementLists(
+        resynthesized.parameters, original.parameters, desc);
     expect(resynthesized.parameterKind, original.parameterKind);
     expect(resynthesized.isInitializingFormal, original.isInitializingFormal,
         reason: desc);
     expect(resynthesized is FieldFormalParameterElementImpl,
         original is FieldFormalParameterElementImpl);
     if (resynthesized is FieldFormalParameterElementImpl &&
         original is FieldFormalParameterElementImpl) {
       if (original.field == null) {
         expect(resynthesized.field, isNull, reason: '$desc field');
       } else {
@@ skipping 138 matching lines @@
     expect(resynthesized.uriOffset, original.uriOffset, reason: desc);
     expect(resynthesized.uriEnd, original.uriEnd, reason: desc);
   }
 
   void compareVariableElements(
       VariableElement resynthesized, VariableElement original, String desc) {
     compareElements(resynthesized, original, desc);
     compareTypes(resynthesized.type, original.type, desc);
     // TODO(scheglov) VariableMember.initializer is not implemented
     if (original is! VariableMember) {
-      compareVariableInitializers(
-          resynthesized.initializer, original.initializer, desc);
+      compareFunctionElements(
+          resynthesized.initializer, original.initializer, desc,
+          compareReturnTypes: false);
     }
     VariableElementImpl originalActual = getActualElement(original, desc);
     if (originalActual is ConstVariableElement) {
       VariableElementImpl resynthesizedActual =
           getActualElement(resynthesized, desc);
       Expression initializer = resynthesizedActual.constantInitializer;
       if (constantInitializersAreInvalid) {
         _assertUnresolvedIdentifier(initializer, desc);
       } else {
         compareConstAsts(initializer, originalActual.constantInitializer,
             '$desc initializer');
       }
     }
     checkPossibleMember(resynthesized, original, desc);
     checkPossibleLocalElements(resynthesized, original);
   }
 
-  void compareVariableInitializers(
-      FunctionElement resynthesized, FunctionElement original, String desc) {
-    if (original == null && resynthesized == null) {
-      return;
-    }
-    expect(resynthesized, isNotNull, reason: desc);
-    expect(resynthesized.nameOffset, original.nameOffset, reason: desc);
-    expect(resynthesized.name, original.name, reason: desc);
-    expect(resynthesized.isSynthetic, original.isSynthetic, reason: desc);
-    // TODO(scheglov) replace this method with compareFunctionElements()
-    // once we resynthesize initializers return types.
-  }
-
   /**
    * Serialize the given [library] into a summary.  Then create a
    * [_TestSummaryResynthesizer] which can deserialize it, along with any
    * references it makes to `dart:core`.
    *
    * Errors will lead to a test failure unless [allowErrors] is `true`.
    */
   _TestSummaryResynthesizer encodeLibrary(LibraryElementImpl library,
       {bool allowErrors: false, bool dumpSummaries: false}) {
     if (!allowErrors) {
@@ skipping 2784 matching lines @@
       fail('Unexpectedly tried to get unlinked summary for $uri');
     }
     return serializedUnit;
   }
 
   @override
   bool hasLibrarySummary(String uri) {
     return true;
   }
 }