Use findMethod() and assertElement() in ExtensionMethodTest.

scheglov · commit-bot@chromium.org · commit 58453dc4c7b0 · 2019-07-24T03:20:04.000Z
R=brianwilkerson@google.com, pquitslund@google.com Change-Id: I25d8a7021e78d045bd57b7462fe24c14d8cab518 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110138 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -5,7 +5,6 @@
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'driver_resolution.dart';
@@ -57,7 +56,7 @@ f() {
 ''');
 
     var invocation = findNode.methodInvocation('c.a()');
-    expect(invocation.methodName.staticElement.library.isDartCore, isFalse);
+    assertElement(invocation, findElement.method('a', of: 'Core2_Ext'));
   }
 
   test_method_noMatch() async {
@@ -111,8 +110,7 @@ f() {
 ''');
 
     var invocation = findNode.methodInvocation('b.a()');
-    var declaration = findNode.methodDeclaration('void a()');
-    expect(invocation.methodName.staticElement, declaration.declaredElement);
+    assertElement(invocation, findElement.method('a'));
   }
 
   test_method_privateExtension() async {
@@ -161,7 +159,7 @@ extension A_Ext on A {
 }
 
 extension B_Ext on B {
-  void /*2*/ a() { }
+  void a() { }
 }
 
 f() {
@@ -171,8 +169,7 @@ f() {
 ''');
 
     var invocation = findNode.methodInvocation('b.a()');
-    var declaration = findNode.methodDeclaration('void /*2*/ a()');
-    expect(invocation.methodName.staticElement, declaration.declaredElement);
+    assertElement(invocation, findElement.method('a', of: 'B_Ext'));
   }
 
   @failingTest
@@ -189,7 +186,7 @@ extension A_Ext<T> on A<T> {
 }
 
 extension B_Ext<T> on B<T> {
-  void /*2*/ f(T x) { }
+  void f(T x) { }
 }
 
 main() {
@@ -200,8 +197,7 @@ main() {
 ''');
 
     var invocation = findNode.methodInvocation('x.f(o)');
-    var declaration = findNode.methodDeclaration('void /*2*/ f(T x)');
-    expect(invocation.methodName.staticElement, declaration.declaredElement);
+    assertElement(invocation, findElement.method('f', of: 'B_Ext'));
   }
 
   test_method_specificSubtypeMatchPlatform() async {
@@ -221,7 +217,7 @@ extension Core_Ext on Core {
 }
 
 extension Core2_Ext on Core2 {
-  void /*2*/ a() => 0;
+  void a() => 0;
 }
 
 f() {
@@ -231,8 +227,7 @@ f() {
 ''');
 
     var invocation = findNode.methodInvocation('c.a()');
-    var declaration = findNode.methodDeclaration('void /*2*/ a()');
-    expect(invocation.methodName.staticElement, declaration.declaredElement);
+    assertElement(invocation, findElement.method('a', of: 'Core2_Ext'));
   }
 
   test_method_unnamedExtension() async {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`import 'package:analyzer/dart/analysis/features.dart';`
`6`	`6`	`import 'package:analyzer/src/error/codes.dart';`
`7`	`7`	`import 'package:analyzer/src/generated/engine.dart';`
`8`		`-import 'package:test/test.dart';`
`9`	`8`	`import 'package:test_reflective_loader/test_reflective_loader.dart';`
`10`	`9`
`11`	`10`	`import 'driver_resolution.dart';`
`@@ -57,7 +56,7 @@ f() {`
`57`	`56`	`''');`
`58`	`57`
`59`	`58`	`var invocation = findNode.methodInvocation('c.a()');`
`60`		`- expect(invocation.methodName.staticElement.library.isDartCore, isFalse);`
	`59`	`+ assertElement(invocation, findElement.method('a', of: 'Core2_Ext'));`
`61`	`60`	`}`
`62`	`61`
`63`	`62`	`test_method_noMatch() async {`
`@@ -111,8 +110,7 @@ f() {`
`111`	`110`	`''');`
`112`	`111`
`113`	`112`	`var invocation = findNode.methodInvocation('b.a()');`
`114`		`- var declaration = findNode.methodDeclaration('void a()');`
`115`		`- expect(invocation.methodName.staticElement, declaration.declaredElement);`
	`113`	`+ assertElement(invocation, findElement.method('a'));`
`116`	`114`	`}`
`117`	`115`
`118`	`116`	`test_method_privateExtension() async {`
`@@ -161,7 +159,7 @@ extension A_Ext on A {`
`161`	`159`	`}`
`162`	`160`
`163`	`161`	`extension B_Ext on B {`
`164`		`- void /2/ a() { }`
	`162`	`+ void a() { }`
`165`	`163`	`}`
`166`	`164`
`167`	`165`	`f() {`
`@@ -171,8 +169,7 @@ f() {`
`171`	`169`	`''');`
`172`	`170`
`173`	`171`	`var invocation = findNode.methodInvocation('b.a()');`
`174`		`- var declaration = findNode.methodDeclaration('void /2/ a()');`
`175`		`- expect(invocation.methodName.staticElement, declaration.declaredElement);`
	`172`	`+ assertElement(invocation, findElement.method('a', of: 'B_Ext'));`
`176`	`173`	`}`
`177`	`174`
`178`	`175`	`@failingTest`
`@@ -189,7 +186,7 @@ extension A_Ext<T> on A<T> {`
`189`	`186`	`}`
`190`	`187`
`191`	`188`	`extension B_Ext<T> on B<T> {`
`192`		`- void /2/ f(T x) { }`
	`189`	`+ void f(T x) { }`
`193`	`190`	`}`
`194`	`191`
`195`	`192`	`main() {`
`@@ -200,8 +197,7 @@ main() {`
`200`	`197`	`''');`
`201`	`198`
`202`	`199`	`var invocation = findNode.methodInvocation('x.f(o)');`
`203`		`- var declaration = findNode.methodDeclaration('void /2/ f(T x)');`
`204`		`- expect(invocation.methodName.staticElement, declaration.declaredElement);`
	`200`	`+ assertElement(invocation, findElement.method('f', of: 'B_Ext'));`
`205`	`201`	`}`
`206`	`202`
`207`	`203`	`test_method_specificSubtypeMatchPlatform() async {`
`@@ -221,7 +217,7 @@ extension Core_Ext on Core {`
`221`	`217`	`}`
`222`	`218`
`223`	`219`	`extension Core2_Ext on Core2 {`
`224`		`- void /2/ a() => 0;`
	`220`	`+ void a() => 0;`
`225`	`221`	`}`
`226`	`222`
`227`	`223`	`f() {`
`@@ -231,8 +227,7 @@ f() {`
`231`	`227`	`''');`
`232`	`228`
`233`	`229`	`var invocation = findNode.methodInvocation('c.a()');`
`234`		`- var declaration = findNode.methodDeclaration('void /2/ a()');`
`235`		`- expect(invocation.methodName.staticElement, declaration.declaredElement);`
	`230`	`+ assertElement(invocation, findElement.method('a', of: 'Core2_Ext'));`
`236`	`231`	`}`
`237`	`232`
`238`	`233`	`test_method_unnamedExtension() async {`