| Index: pkg/analysis_server/test/services/completion/completion_test_util.dart
|
| diff --git a/pkg/analysis_server/test/services/completion/completion_test_util.dart b/pkg/analysis_server/test/services/completion/completion_test_util.dart
|
| index ce6c74eaae2addcba87a2ee2ee4aab033ee11d1a..2153dfe0f9f8f4f2abfff8a57f97b00e1b12d93f 100644
|
| --- a/pkg/analysis_server/test/services/completion/completion_test_util.dart
|
| +++ b/pkg/analysis_server/test/services/completion/completion_test_util.dart
|
| @@ -56,7 +56,9 @@ class AbstractCompletionTest extends AbstractContextTest {
|
| }
|
|
|
| void assertNoSuggestions() {
|
| - expect(request.suggestions, hasLength(0));
|
| + if (request.suggestions.length > 0) {
|
| + _failedCompletion('Expected no suggestions', request.suggestions);
|
| + }
|
| }
|
|
|
| CompletionSuggestion assertNotSuggested(String completion) {
|
| @@ -383,21 +385,21 @@ class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
|
| }
|
| }
|
|
|
| - CompletionSuggestion assertSuggestImportedTopLevelVar(String name,
|
| - String returnType, [CompletionRelevance relevance =
|
| + CompletionSuggestion assertSuggestImportedFunction(String name,
|
| + String returnType, [bool isDeprecated = false, CompletionRelevance relevance =
|
| CompletionRelevance.DEFAULT]) {
|
| if (computer is ImportedComputer) {
|
| - return assertSuggestTopLevelVar(name, returnType, relevance);
|
| + return assertSuggestFunction(name, returnType, isDeprecated, relevance);
|
| } else {
|
| return assertNotSuggested(name);
|
| }
|
| }
|
|
|
| - CompletionSuggestion assertSuggestImportedFunction(String name,
|
| - String returnType, [bool isDeprecated = false, CompletionRelevance relevance =
|
| + CompletionSuggestion assertSuggestImportedTopLevelVar(String name,
|
| + String returnType, [CompletionRelevance relevance =
|
| CompletionRelevance.DEFAULT]) {
|
| if (computer is ImportedComputer) {
|
| - return assertSuggestFunction(name, returnType, isDeprecated, relevance);
|
| + return assertSuggestTopLevelVar(name, returnType, relevance);
|
| } else {
|
| return assertNotSuggested(name);
|
| }
|
| @@ -688,6 +690,17 @@ class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
|
| });
|
| }
|
|
|
| + test_ImportDirective_dart() {
|
| + // SimpleStringLiteral ImportDirective
|
| + addTestSource('''
|
| + import "dart^";
|
| + main() {}''');
|
| + computeFast();
|
| + return computeFull(true).then((_) {
|
| + assertNoSuggestions();
|
| + });
|
| + }
|
| +
|
| test_InstanceCreationExpression_imported() {
|
| // SimpleIdentifier TypeName ConstructorName InstanceCreationExpression
|
| addSource('/testA.dart', '''
|
|
|