First step to resolving simple API changes.

pkg/analyzer/test/generated/incremental_resolver_test.dart

 // Copyright (c) 2014, 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 engine.incremental_resolver_test;
 
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
@@ skipping 1637 matching lines @@
 class A {
   operator +(other) {}
 }
 ''', r'''
 class A {
   operator +(other) {}
 }
 ''');
   }
 
+  void test_true_method_parameters_type_functionType() {
+    _assertMatches(r'''
+typedef F();
+class A {
+  m(F p) {}
+}
+''', r'''
+typedef F();
+class A {
+  m(F p) {}
+}
+''');
+  }
+
   void test_true_part_list_reorder() {
     addNamedSource('/unitA.dart', 'part of lib; class A {}');
     addNamedSource('/unitB.dart', 'part of lib; class B {}');
     _assertMatches(r'''
 library lib;
 part 'unitA.dart';
 part 'unitB.dart';
 ''', r'''
 library lib;
 part 'unitB.dart';
@@ skipping 205 matching lines @@
   }
 }
 
 
 class IncrementalResolverTest extends ResolverTestCase {
   Source source;
   String code;
   LibraryElement library;
   CompilationUnit unit;
 
+  void setUp() {
+    super.setUp();
+    test_resolveApiChanges = true;
+  }
+
+  void test_api_method_edit_returnType() {
+    _resolveUnit(r'''
+class A {
+  int m() {
+    return null;
+  }
+}
+main() {
+  A a = new A();
+  var v = a.m();
+}
+''');
+    _resolve(_editString('int m', 'String m'), _isDeclaration);
+    // We don't add or fix an error, but we verify that type of "v"
+    // is updated from "int" to "String".
+  }
+
   void test_classMemberAccessor_body() {
     _resolveUnit(r'''
 class A {
   int get test {
     return 1 + 2;
   }
 }''');
     _resolve(_editString('+', '*'), _isFunctionBody);
   }
 
@@ skipping 272 matching lines @@
    * the incremental resolution and non-incremental resolutions are the same.
    */
   void _resolve(_Edit edit, Predicate<AstNode> predicate) {
     int offset = edit.offset;
     // parse "newCode"
     String newCode =
         code.substring(0, offset) +
         edit.replacement +
         code.substring(offset + edit.length);
     CompilationUnit newUnit = _parseUnit(newCode);
-    // update tokens
-    {
-      int delta = edit.replacement.length - edit.length;
-      _shiftTokens(unit.beginToken, offset, delta);
-    }
     // replace the node
     AstNode oldNode = _findNodeAt(unit, offset, predicate);
     AstNode newNode = _findNodeAt(newUnit, offset, predicate);
     {
       bool success = NodeReplacer.replace(oldNode, newNode);
       expect(success, isTrue);
     }
+    // update tokens
+    {
+      int delta = edit.replacement.length - edit.length;
+      _shiftTokens(unit.beginToken, offset, delta);
+    }
     // do incremental resolution
     IncrementalResolver resolver = new IncrementalResolver(
         typeProvider,
         unit.element,
         edit.offset,
         edit.length,
         edit.replacement.length);
     bool success = resolver.resolve(newNode);
     expect(success, isTrue);
     // resolve "newCode" from scratch
@@ skipping 1792 matching lines @@
   }
 
   @override
   visitYieldStatement(YieldStatement node) {
     YieldStatement other = this.other;
     _visitNode(node.expression, other.expression);
   }
 
   void _verifyElement(Element a, Element b) {
     if (a != b) {
-      print(a.location);
-      print(b.location);
       fail('Expected: $b\n  Actual: $a');
     }
     if (a == null && b == null) {
       return;
     }
     if (a.nameOffset != b.nameOffset) {
       fail('Expected: ${b.nameOffset}\n  Actual: ${a.nameOffset}');
     }
   }
 
   void _verifyType(DartType a, DartType b) {
-    expect(a, equals(b));
+    if (a != b) {
+      fail('Expected: $b\n  Actual: $a');
+    }
   }
 
   void _visitAnnotatedNode(AnnotatedNode node, AnnotatedNode other) {
     _visitNode(node.documentationComment, other.documentationComment);
     _visitList(node.metadata, other.metadata);
   }
 
   _visitDeclaration(Declaration node, Declaration other) {
     _verifyElement(node.element, other.element);
     _visitAnnotatedNode(node, other);
@@ skipping 37 matching lines @@
     _visitList(node.metadata, other.metadata);
     _visitNode(node.identifier, other.identifier);
   }
 
   static void assertSameResolution(CompilationUnit actual,
       CompilationUnit expected) {
     _SameResolutionValidator validator = new _SameResolutionValidator(expected);
     actual.accept(validator);
   }
 }