| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library test.services.completion.dart.local; | 5 library test.services.completion.dart.local; |
| 6 | 6 |
| 7 import 'package:analysis_server/src/protocol_server.dart'; | 7 import 'package:analysis_server/src/protocol_server.dart'; |
| 8 import 'package:analysis_server/src/services/completion/dart_completion_manager.
dart'; | 8 import 'package:analysis_server/src/services/completion/dart_completion_manager.
dart'; |
| 9 import 'package:analysis_server/src/services/completion/local_computer.dart'; | 9 import 'package:analysis_server/src/services/completion/local_computer.dart'; |
| 10 import 'package:unittest/unittest.dart'; | 10 import 'package:unittest/unittest.dart'; |
| 11 | 11 |
| 12 import '../../reflective_tests.dart'; | 12 import '../../reflective_tests.dart'; |
| 13 import 'completion_test_util.dart'; | 13 import 'completion_test_util.dart'; |
| 14 | 14 |
| 15 main() { | 15 main() { |
| 16 groupSep = ' | '; | 16 groupSep = ' | '; |
| 17 runReflectiveTests(LocalComputerTest); | 17 runReflectiveTests(LocalComputerTest); |
| 18 } | 18 } |
| 19 | 19 |
| 20 @reflectiveTest | 20 @reflectiveTest |
| 21 class LocalComputerTest extends AbstractSelectorSuggestionTest { | 21 class LocalComputerTest extends AbstractSelectorSuggestionTest { |
| 22 @override | 22 @override |
| 23 CompletionSuggestion assertSuggestLocalClass(String name, | 23 CompletionSuggestion assertSuggestLocalClass(String name, |
| 24 {int relevance: DART_RELEVANCE_DEFAULT, bool isDeprecated: false}) { | 24 {CompletionSuggestionKind kind: CompletionSuggestionKind.INVOCATION, |
| 25 int relevance: DART_RELEVANCE_DEFAULT, bool isDeprecated: false}) { |
| 25 return assertSuggestClass(name, | 26 return assertSuggestClass(name, |
| 26 relevance: relevance, isDeprecated: isDeprecated); | 27 kind: kind, relevance: relevance, isDeprecated: isDeprecated); |
| 27 } | 28 } |
| 28 | 29 |
| 29 @override | 30 @override |
| 30 CompletionSuggestion assertSuggestLocalClassTypeAlias(String name, | 31 CompletionSuggestion assertSuggestLocalClassTypeAlias(String name, |
| 31 {int relevance: DART_RELEVANCE_DEFAULT}) { | 32 {int relevance: DART_RELEVANCE_DEFAULT}) { |
| 32 return assertSuggestClassTypeAlias(name, relevance); | 33 return assertSuggestClassTypeAlias(name, relevance); |
| 33 } | 34 } |
| 34 | 35 |
| 35 @override | 36 @override |
| 36 CompletionSuggestion assertSuggestLocalConstructor(String name) { | 37 CompletionSuggestion assertSuggestLocalConstructor(String name) { |
| 37 return assertSuggestConstructor(name); | 38 return assertSuggestConstructor(name); |
| 38 } | 39 } |
| 39 | 40 |
| 40 @override | 41 @override |
| 41 CompletionSuggestion assertSuggestLocalField(String name, String type, | 42 CompletionSuggestion assertSuggestLocalField(String name, String type, |
| 42 {int relevance: DART_RELEVANCE_LOCAL_FIELD, bool deprecated: false}) { | 43 {int relevance: DART_RELEVANCE_LOCAL_FIELD, bool deprecated: false}) { |
| 43 return assertSuggestField(name, type, | 44 return assertSuggestField(name, type, |
| 44 relevance: relevance, isDeprecated: deprecated); | 45 relevance: relevance, isDeprecated: deprecated); |
| 45 } | 46 } |
| 46 | 47 |
| 47 @override | 48 @override |
| 48 CompletionSuggestion assertSuggestLocalFunction( | 49 CompletionSuggestion assertSuggestLocalFunction( |
| 49 String name, String returnType, | 50 String name, String returnType, |
| 50 {bool deprecated: false, int relevance: DART_RELEVANCE_LOCAL_FUNCTION}) { | 51 {CompletionSuggestionKind kind: CompletionSuggestionKind.INVOCATION, |
| 51 return assertSuggestFunction(name, returnType, deprecated, relevance); | 52 bool deprecated: false, int relevance: DART_RELEVANCE_LOCAL_FUNCTION}) { |
| 53 return assertSuggestFunction(name, returnType, |
| 54 kind: kind, deprecated: deprecated, relevance: relevance); |
| 52 } | 55 } |
| 53 | 56 |
| 54 @override | 57 @override |
| 55 CompletionSuggestion assertSuggestLocalFunctionTypeAlias( | 58 CompletionSuggestion assertSuggestLocalFunctionTypeAlias( |
| 56 String name, String returnType, | 59 String name, String returnType, |
| 57 {bool deprecated: false, int relevance: DART_RELEVANCE_DEFAULT}) { | 60 {bool deprecated: false, int relevance: DART_RELEVANCE_DEFAULT}) { |
| 58 return assertSuggestFunctionTypeAlias( | 61 return assertSuggestFunctionTypeAlias( |
| 59 name, returnType, deprecated, relevance); | 62 name, returnType, deprecated, relevance); |
| 60 } | 63 } |
| 61 | 64 |
| (...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 689 assertSuggestLocalMethod('m', 'A', 'void'); | 692 assertSuggestLocalMethod('m', 'A', 'void'); |
| 690 expect(suggestion.parameterNames, hasLength(2)); | 693 expect(suggestion.parameterNames, hasLength(2)); |
| 691 expect(suggestion.parameterNames[0], 'x'); | 694 expect(suggestion.parameterNames[0], 'x'); |
| 692 expect(suggestion.parameterTypes[0], 'dynamic'); | 695 expect(suggestion.parameterTypes[0], 'dynamic'); |
| 693 expect(suggestion.parameterNames[1], 'y'); | 696 expect(suggestion.parameterNames[1], 'y'); |
| 694 expect(suggestion.parameterTypes[1], 'int'); | 697 expect(suggestion.parameterTypes[1], 'int'); |
| 695 expect(suggestion.requiredParameterCount, 2); | 698 expect(suggestion.requiredParameterCount, 2); |
| 696 expect(suggestion.hasNamedParameters, false); | 699 expect(suggestion.hasNamedParameters, false); |
| 697 } | 700 } |
| 698 } | 701 } |
| OLD | NEW |