| Index: pkg/analysis_server/test/search/top_level_declarations_test.dart
|
| diff --git a/pkg/analysis_server/test/search/top_level_declarations_test.dart b/pkg/analysis_server/test/search/top_level_declarations_test.dart
|
| index 30885a4c438c4a79eb4bc2c279202eb758cf7d8e..df4929bc190fe7b85c1ebb404841d8b52e04f825 100644
|
| --- a/pkg/analysis_server/test/search/top_level_declarations_test.dart
|
| +++ b/pkg/analysis_server/test/search/top_level_declarations_test.dart
|
| @@ -4,12 +4,13 @@
|
|
|
| library test.search.top_level_declarations;
|
|
|
| +import 'dart:async';
|
| +
|
| import 'package:analysis_server/src/protocol.dart';
|
| -import '../reflective_tests.dart';
|
| import 'package:unittest/unittest.dart';
|
|
|
| +import '../reflective_tests.dart';
|
| import 'abstract_search_domain.dart';
|
| -import 'dart:async';
|
|
|
|
|
| main() {
|
| @@ -20,18 +21,6 @@ main() {
|
|
|
| @ReflectiveTestCase()
|
| class TopLevelDeclarationsTest extends AbstractSearchDomainTest {
|
| - Future findTopLevelDeclarations(String pattern) {
|
| - return waitForTasksFinished().then((_) {
|
| - Request request = new SearchFindTopLevelDeclarationsParams(
|
| - pattern).toRequest('0');
|
| - Response response = handleSuccessfulRequest(request);
|
| - searchId = new SearchFindTopLevelDeclarationsResult.fromResponse(
|
| - response).id;
|
| - results.clear();
|
| - return waitForSearchResults();
|
| - });
|
| - }
|
| -
|
| void assertHasDeclaration(ElementKind kind, String name) {
|
| result = findTopLevelResult(kind, name);
|
| if (result == null) {
|
| @@ -46,6 +35,18 @@ class TopLevelDeclarationsTest extends AbstractSearchDomainTest {
|
| }
|
| }
|
|
|
| + Future findTopLevelDeclarations(String pattern) {
|
| + return waitForTasksFinished().then((_) {
|
| + Request request =
|
| + new SearchFindTopLevelDeclarationsParams(pattern).toRequest('0');
|
| + Response response = handleSuccessfulRequest(request);
|
| + searchId =
|
| + new SearchFindTopLevelDeclarationsResult.fromResponse(response).id;
|
| + results.clear();
|
| + return waitForSearchResults();
|
| + });
|
| + }
|
| +
|
| SearchResult findTopLevelResult(ElementKind kind, String name) {
|
| for (SearchResult result in results) {
|
| Element element = result.path[0];
|
|
|