Index: pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart |
diff --git a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart |
index 4bb1812363cdf239a52e9719448957cb53117cf8..b5ccc8c69f170919b2ec1d358433bfacfc69c087 100644 |
--- a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart |
+++ b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart |
@@ -8,12 +8,10 @@ import 'package:analysis_server/src/services/correction/status.dart'; |
import 'package:analysis_server/src/services/index/index.dart'; |
import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
import 'package:analysis_server/src/services/search/search_engine.dart'; |
-import 'package:analysis_server/src/services/search/search_engine_internal.dart'; |
import 'package:analysis_server/src/services/search/search_engine_internal2.dart'; |
import 'package:analyzer/dart/ast/ast.dart'; |
import 'package:analyzer/dart/element/element.dart' show Element; |
import 'package:analyzer/file_system/file_system.dart'; |
-import 'package:analyzer/src/dart/analysis/ast_provider_context.dart'; |
import 'package:analyzer/src/dart/analysis/ast_provider_driver.dart'; |
import 'package:analyzer/src/dart/element/ast_provider.dart'; |
import 'package:analyzer/src/generated/source.dart'; |
@@ -165,29 +163,15 @@ abstract class RefactoringTest extends AbstractSingleUnitTest { |
Future<Null> indexTestUnit(String code) async { |
await resolveTestUnit(code); |
- if (!enableNewAnalysisDriver) { |
- index.indexUnit(testUnit); |
- } |
} |
Future<Null> indexUnit(String file, String code) async { |
- Source source = addSource(file, code); |
- if (!enableNewAnalysisDriver) { |
- CompilationUnit unit = await resolveLibraryUnit(source); |
- index.indexUnit(unit); |
- } |
+ addSource(file, code); |
} |
void setUp() { |
super.setUp(); |
- if (enableNewAnalysisDriver) { |
- searchEngine = new SearchEngineImpl2([driver]); |
- astProvider = new AstProviderForDriver(driver); |
- } else { |
- index = createMemoryIndex(); |
- searchEngine = new SearchEngineImpl( |
- index, (_) => new AstProviderForContext(context)); |
- astProvider = new AstProviderForContext(context); |
- } |
+ searchEngine = new SearchEngineImpl2([driver]); |
+ astProvider = new AstProviderForDriver(driver); |
} |
} |