| Index: pkg/analysis_services/test/completion/top_level_computer_test.dart
|
| diff --git a/pkg/analysis_services/test/completion/top_level_computer_test.dart b/pkg/analysis_services/test/completion/top_level_computer_test.dart
|
| index 113f5fd3c994e6e40febd91f18965d0529337118..b12e07e397ac3b38e6f9fce18fc295a77a91ebdd 100644
|
| --- a/pkg/analysis_services/test/completion/top_level_computer_test.dart
|
| +++ b/pkg/analysis_services/test/completion/top_level_computer_test.dart
|
| @@ -5,14 +5,11 @@
|
| library test.services.completion.toplevel;
|
|
|
| import 'package:analysis_services/completion/completion_suggestion.dart';
|
| -import 'package:analysis_services/completion/top_level_computer.dart';
|
| -import 'package:analysis_services/index/index.dart';
|
| -import 'package:analysis_services/index/local_memory_index.dart';
|
| -import 'package:analysis_services/src/search/search_engine.dart';
|
| -import 'package:analysis_testing/abstract_single_unit.dart';
|
| +import 'package:analysis_services/src/completion/top_level_computer.dart';
|
| import 'package:analysis_testing/reflective_tests.dart';
|
| import 'package:unittest/unittest.dart';
|
| -import 'dart:async';
|
| +
|
| +import 'completion_test_util.dart';
|
|
|
| main() {
|
| groupSep = ' | ';
|
| @@ -20,11 +17,7 @@ main() {
|
| }
|
|
|
| @ReflectiveTestCase()
|
| -class TopLevelComputerTest extends AbstractSingleUnitTest {
|
| - Index index;
|
| - SearchEngineImpl searchEngine;
|
| - TopLevelComputer computer;
|
| - List<CompletionSuggestion> suggestions;
|
| +class TopLevelComputerTest extends AbstractCompletionTest {
|
|
|
| test_class() {
|
| addTestUnit('class B {boolean v;}');
|
| @@ -34,44 +27,9 @@ class TopLevelComputerTest extends AbstractSingleUnitTest {
|
| });
|
| }
|
|
|
| - void addTestUnit(String code) {
|
| - resolveTestUnit(code);
|
| - index.indexUnit(context, testUnit);
|
| - }
|
| -
|
| - void assertHasResult(CompletionSuggestionKind kind, String completion,
|
| - [CompletionRelevance relevance = CompletionRelevance.DEFAULT,
|
| - bool isDeprecated = false, bool isPotential = false]) {
|
| - var cs = suggestions.firstWhere((cs) => cs.completion == completion, orElse: () {
|
| - var completions = suggestions.map((s) => s.completion).toList();
|
| - fail('expected "$completion" but found\n $completions');
|
| - });
|
| - expect(cs.kind, equals(kind));
|
| - expect(cs.relevance, equals(relevance));
|
| - expect(cs.selectionOffset, equals(completion.length));
|
| - expect(cs.selectionLength, equals(0));
|
| - expect(cs.isDeprecated, equals(isDeprecated));
|
| - expect(cs.isPotential, equals(isPotential));
|
| - }
|
| -
|
| - void assertNoResult(String completion) {
|
| - if (suggestions.any((cs) => cs.completion == completion)) {
|
| - fail('did not expect completion: $completion');
|
| - }
|
| - }
|
| -
|
| - Future compute() {
|
| - return computer.compute().then((List<CompletionSuggestion> results) {
|
| - this.suggestions = results;
|
| - });
|
| - }
|
| -
|
| @override
|
| void setUp() {
|
| super.setUp();
|
| - index = createLocalMemoryIndex();
|
| - searchEngine = new SearchEngineImpl(index);
|
| computer = new TopLevelComputer(searchEngine);
|
| - verifyNoTestUnitErrors = false;
|
| }
|
| }
|
|
|