Tweaks for refactoring tests.

pkg/analysis_server/test/services/refactoring/rename_class_member_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 test.services.refactoring.rename_class_member;
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_testing/reflective_tests.dart';
 import 'package:unittest/unittest.dart';
 
@@ skipping 341 matching lines @@
   print(c.test);
   c.test = 1;
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test; // marker');
     expect(refactoring.refactoringName, 'Rename Field');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   int newName; // marker
   main() {
     print(newName);
     newName = 1;
     newName += 2;
   }
 }
 class B extends A {
 }
@@ skipping 22 matching lines @@
   final test;
   A() : test = 5;
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test;');
     expect(refactoring.refactoringName, 'Rename Field');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   final newName;
   A() : newName = 5;
 }
 ''');
   }
 
   test_createChange_FieldElement_fieldFormalParameter() {
     indexTestUnit('''
 class A {
   final test;
   A(this.test);
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test;');
     expect(refactoring.refactoringName, 'Rename Field');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   final newName;
   A(this.newName);
 }
 ''');
   }
 
   test_createChange_FieldElement_invocation() {
     indexTestUnit('''
 typedef F(a);
 class A {
   F test;
   main() {
     test(1);
   }
 }
 main() {
   A a = new A();
   a.test(2);
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test(2);');
     expect(refactoring.refactoringName, 'Rename Field');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 typedef F(a);
 class A {
   F newName;
   main() {
     newName(1);
   }
 }
 main() {
   A a = new A();
   a.newName(2);
@@ skipping 30 matching lines @@
   d.test();
   e.test();
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test() {} // marker');
     expect(refactoring.refactoringName, 'Rename Method');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   newName() {}
 }
 class B extends A {
   newName() {} // marker
 }
 class C extends B {
   newName() {}
 }
 class D implements A {
@@ skipping 27 matching lines @@
   new A().test();
   a.test(); // 2
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test() {}');
     expect(refactoring.refactoringName, 'Rename Method');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   newName() {}
 }
 main(var a) {
   a.newName(); // 1
   new A().newName();
   a.newName(); // 2
 }
 ''').then((_) {
       assertPotentialEdits(['test(); // 1', 'test(); // 2']);
@@ skipping 15 matching lines @@
   a._test();
   new A()._test();
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('_test() {}');
     expect(refactoring.refactoringName, 'Rename Method');
     expect(refactoring.oldName, '_test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   newName() {}
 }
 main(var a) {
   a.newName();
   new A().newName();
 }
 ''').then((_) {
       assertNoFileChange('/lib.dart');
     });
@@ skipping 22 matching lines @@
   print(b.test);
   b.test = 2;
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test {} // marker');
     expect(refactoring.refactoringName, 'Rename Field');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   get newName {} // marker
   set newName(x) {}
   main() {
     print(newName);
     newName = 1;
   }
 }
 class B extends A {
   get newName {}
@@ skipping 34 matching lines @@
   print(b.test);
   b.test = 2;
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test(x) {} // marker');
     expect(refactoring.refactoringName, 'Rename Field');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A {
   get newName {}
   set newName(x) {} // marker
   main() {
     print(newName);
     newName = 1;
   }
 }
 class B extends A {
   get newName {}
@@ skipping 18 matching lines @@
   List<Test> items;
   Test method(Test p) => null;
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('Test> {');
     expect(refactoring.refactoringName, 'Rename Type Parameter');
     expect(refactoring.oldName, 'Test');
     refactoring.newName = 'NewName';
     // validate change
-    return assertSuccessfulRename('''
+    return assertSuccessfulRefactoring('''
 class A<NewName> {
   NewName field;
   List<NewName> items;
   NewName method(NewName p) => null;
 }
 ''');
   }
 }