Chromium Code Reviews| 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 42064afe92fe15bce3db9537c36c10f59398a0b8..e7cf3d5b32c3c1c3a0fb51d0934cb7b9bc280d1d 100644 |
| --- a/pkg/analysis_server/test/services/completion/completion_test_util.dart |
| +++ b/pkg/analysis_server/test/services/completion/completion_test_util.dart |
| @@ -71,6 +71,13 @@ abstract class AbstractCompletionTest extends AbstractContextTest { |
| new CompletionPerformance()); |
| } |
| + void assertHasNoParameterInfo(CompletionSuggestion suggestion) { |
| + expect(suggestion.parameterNames, isNull); |
| + expect(suggestion.parameterTypes, isNull); |
| + expect(suggestion.requiredParameterCount, isNull); |
| + expect(suggestion.hasNamedParameters, isNull); |
| + } |
| + |
| void assertNoSuggestions({CompletionSuggestionKind kind: null}) { |
| if (kind == null) { |
| if (request.suggestions.length > 0) { |
| @@ -213,7 +220,7 @@ abstract class AbstractCompletionTest extends AbstractContextTest { |
| } |
| CompletionSuggestion assertSuggestFunction(String name, String returnType, |
| - bool isDeprecated, [int relevance = COMPLETION_RELEVANCE_DEFAULT, |
| + [bool isDeprecated = false, int relevance = COMPLETION_RELEVANCE_DEFAULT, |
| CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) { |
| CompletionSuggestion cs = assertSuggest( |
| name, |
| @@ -1298,7 +1305,7 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest { |
| lib B; |
| class F { var f1; f2() { } get f3 => 0; set f4(fx) { } } |
| class E extends F { var e1; e2() { } } |
| - class I { int i1; i2() { } get e1; } |
|
Paul Berry
2015/01/13 00:02:47
I'm curious why this getter was removed.
danrubel
2015/01/13 14:19:59
Oops. Forgot to add a comment about that. Done.
|
| + class I { int i1; i2() { } } |
| class M { var m1; int m2() { } }'''); |
| addTestSource(''' |
| import "/testB.dart"; |
| @@ -1311,10 +1318,9 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest { |
| assertSuggestImportedField('m1', null); |
| assertSuggestImportedGetter('f3', null); |
| assertSuggestImportedSetter('f4'); |
| - //TODO (danrubel) include declared type in suggestion |
| - assertSuggestImportedMethod('e2', null, null); |
| - assertSuggestImportedMethod('f2', null, null); |
| - assertSuggestImportedMethod('i2', null, null); |
| + assertSuggestImportedMethod('e2', 'E', null); |
| + assertSuggestImportedMethod('f2', 'F', null); |
| + assertSuggestImportedMethod('i2', 'I', null); |
| //assertSuggestImportedMethod('m2', null, null); |
| assertNotSuggested('=='); |
| }); |