clean up generic methods in resolution

pkg/analyzer/test/src/task/strong/checker_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.
 
 // TODO(jmesserly): this file needs to be refactored, it's a port from
 // package:dev_compiler's tests
 /// General type checking tests
 library analyzer.test.src.task.strong.checker_test;
 
 import 'package:unittest/unittest.dart';
@@ skipping 84 matching lines @@
       }
       class B extends A {
         int call(int x) => x;
         double col(double x) => x;
       }
       void main() {
         {
           B f = new B();
           int x;
           double y;
-          // The analyzer has what I believe is a bug (dartbug.com/23252) which
-          // causes the return type of calls to f to be treated as dynamic.
-          x = /*info:DYNAMIC_CAST should be pass*/f(3);
+          x = f(3);
           x = /*severe:STATIC_TYPE_ERROR*/f.col(3.0);
-          y = /*info:DYNAMIC_CAST should be severe:STATIC_TYPE_ERROR*/f(3);
+          y = /*severe:STATIC_TYPE_ERROR*/f(3);
           y = f.col(3.0);
           f(/*severe:STATIC_TYPE_ERROR*/3.0);
           f.col(/*severe:STATIC_TYPE_ERROR*/3);
         }
         {
           Function f = new B();
           int x;
           double y;
           x = /*info:DYNAMIC_CAST, info:DYNAMIC_INVOKE*/f(3);
           x = /*info:DYNAMIC_CAST, info:DYNAMIC_INVOKE*/f.col(3.0);
@@ skipping 1267 matching lines @@
           class DerivedFuture3<T> extends Future<T> {
             /*=S*/ then/*<S>*/(Object onValue(T t)) => null;
           }
 
           class DerivedFuture4<A> extends Future<A> {
             /*=B*/ then/*<B>*/(Object onValue(A a)) => null;
           }
        '''
   });
 
+
+  testChecker('generic methods on different element kinds', {
+    '/main.dart': '''
+class C<E> {
+  /*=T*/ f/*<T>*/(/*=T*/ e) => null;
+  static /*=T*/ g/*<T>*/(/*=T*/ e) => null;
+  static final h = g;
+}
+
+/*=T*/ topF/*<T>*/(/*=T*/ e) => null;
+
+var topG = C.g;
+
+void test/*<S>*/(/*=T*/ pf/*<T>*/(/*=T*/ e)) {
+  var c = new C<int>();
+  var methodCall = c.f/*<int>*/(3);
+  var localG = C.g;
+  int staticFieldCall = C.h/*<int>*/(3);
+  int topFieldCall = topG/*<int>*/(3);
+  int localVarCall = localG/*<int>*/(3);
+  int paramCall = pf/*<int>*/(3);
+}
+    '''
+  });
+
   testChecker('unary operators', {
     '/main.dart': '''
       class A {
         A operator ~() {}
         A operator +(int x) {}
         A operator -(int x) {}
         A operator -() {}
       }
 
       foo() => new A();
@@ skipping 1062 matching lines @@
 
         baz1() sync* { yield* (/*info:DYNAMIC_CAST*/x); }
         Iterable baz2() sync* { yield* (/*info:DYNAMIC_CAST*/x); }
         Iterable<int> baz3() sync* { yield* (/*warning:DOWN_CAST_COMPOSITE*/x); }
         Iterable<int> baz4() sync* { yield* new Iterable<int>(); }
         Iterable<int> baz5() sync* { yield* (/*info:INFERRED_TYPE_ALLOCATION*/new Iterable()); }
     '''
     });
   });
 }