| Index: pkg/analysis_server/test/edit/refactoring_test.dart
|
| diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart
|
| index 696c4e003a15f05d3d0c67b34cc4b89fac175777..2ceb1cddc53b5014a12918b82f78080e5cfa9204 100644
|
| --- a/pkg/analysis_server/test/edit/refactoring_test.dart
|
| +++ b/pkg/analysis_server/test/edit/refactoring_test.dart
|
| @@ -7,9 +7,11 @@ library test.edit.refactoring;
|
| import 'dart:async';
|
|
|
| import 'package:analysis_server/src/edit/edit_domain.dart';
|
| +import 'package:analysis_server/src/plugin/server_plugin.dart';
|
| import 'package:analysis_server/src/protocol.dart';
|
| import 'package:analysis_server/src/services/index/index.dart';
|
| import 'package:analysis_server/src/services/index/local_memory_index.dart';
|
| +import 'package:analyzer/src/plugin/plugin_impl.dart';
|
| import 'package:unittest/unittest.dart' hide ERROR;
|
|
|
| import '../analysis_abstract.dart';
|
| @@ -609,13 +611,6 @@ class GetAvailableRefactoringsTest extends AbstractAnalysisTest {
|
| List<RefactoringKind> kinds;
|
|
|
| /**
|
| - * Tests that there is a RENAME refactoring available at the [search] offset.
|
| - */
|
| - Future assertHasRenameRefactoring(String code, String search) async {
|
| - return assertHasKind(code, search, RefactoringKind.RENAME, true);
|
| - }
|
| -
|
| - /**
|
| * Tests that there is refactoring of the given [kind] is available at the
|
| * [search] offset.
|
| */
|
| @@ -632,6 +627,13 @@ class GetAvailableRefactoringsTest extends AbstractAnalysisTest {
|
| expect(kinds, matcher);
|
| }
|
|
|
| + /**
|
| + * Tests that there is a RENAME refactoring available at the [search] offset.
|
| + */
|
| + Future assertHasRenameRefactoring(String code, String search) async {
|
| + return assertHasKind(code, search, RefactoringKind.RENAME, true);
|
| + }
|
| +
|
| @override
|
| Index createIndex() {
|
| return createLocalMemoryIndex();
|
| @@ -667,10 +669,19 @@ class GetAvailableRefactoringsTest extends AbstractAnalysisTest {
|
| void setUp() {
|
| super.setUp();
|
| createProject();
|
| - handler = new EditDomainHandler(server);
|
| + ExtensionManager manager = new ExtensionManager();
|
| + ServerPlugin plugin = new ServerPlugin();
|
| + manager.processPlugins([plugin]);
|
| + handler = new EditDomainHandler(server, plugin);
|
| server.handlers = [handler];
|
| }
|
|
|
| + Future test_convertMethodToGetter_hasElement() {
|
| + return assertHasKind('''
|
| +int getValue() => 42;
|
| +''', 'getValue', RefactoringKind.CONVERT_METHOD_TO_GETTER, true);
|
| + }
|
| +
|
| Future test_extractLocal() async {
|
| addTestFile('''
|
| main() {
|
| @@ -683,12 +694,6 @@ main() {
|
| expect(kinds, contains(RefactoringKind.EXTRACT_METHOD));
|
| }
|
|
|
| - Future test_convertMethodToGetter_hasElement() {
|
| - return assertHasKind('''
|
| -int getValue() => 42;
|
| -''', 'getValue', RefactoringKind.CONVERT_METHOD_TO_GETTER, true);
|
| - }
|
| -
|
| Future test_rename_hasElement_class() {
|
| return assertHasRenameRefactoring('''
|
| class Test {}
|
| @@ -1702,9 +1707,12 @@ class _AbstractGetRefactoring_Test extends AbstractAnalysisTest {
|
| @override
|
| void setUp() {
|
| super.setUp();
|
| - server.handlers = [new EditDomainHandler(server),];
|
| createProject();
|
| - handler = new EditDomainHandler(server);
|
| + ExtensionManager manager = new ExtensionManager();
|
| + ServerPlugin plugin = new ServerPlugin();
|
| + manager.processPlugins([plugin]);
|
| + handler = new EditDomainHandler(server, plugin);
|
| + server.handlers = [handler];
|
| }
|
| }
|
|
|
|
|