Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(357)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analysis_server/test/services/completion/dart/common_usage_sorter_test.dart

Issue 1539693002: move DartCompletionSorter to dart specific contributor (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: merge Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analysis_server/test/domain_completion_util.dart ('k') | pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/services/completion/dart/common_usage_sorter_test.dart
diff --git a/pkg/analysis_server/test/services/completion/dart/common_usage_sorter_test.dart b/pkg/analysis_server/test/services/completion/dart/common_usage_sorter_test.dart
index fd73a724f5753a4ac7724042ae6443c6f6251c45..498b3d15fa30b65000662435e24c339f8c7c9554 100644
--- a/pkg/analysis_server/test/services/completion/dart/common_usage_sorter_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/common_usage_sorter_test.dart
@@ -7,22 +7,13 @@ library test.services.completion.dart.sorter.common;
import 'dart:async';
import 'package:analysis_server/plugin/protocol/protocol.dart';
-import 'package:analysis_server/src/analysis_server.dart'
- show ContextSourcePair;
-import 'package:analysis_server/src/constants.dart';
-import 'package:analysis_server/src/domain_completion.dart';
import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
import 'package:analysis_server/src/services/completion/dart/common_usage_sorter.dart';
-import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
-import 'package:analysis_server/src/services/index/index.dart';
-import 'package:analysis_server/src/services/index/local_memory_index.dart';
-import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/source.dart';
+import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
import 'package:unittest/unittest.dart';
-import '../../../analysis_abstract.dart';
-import '../../../mocks.dart';
+import '../../../domain_completion_util.dart';
import '../../../utils.dart';
main() {
@@ -31,125 +22,29 @@ main() {
}
@reflectiveTest
-class CommonUsageSorterTest extends AbstractAnalysisTest {
- String completionId;
- int completionOffset;
- int replacementOffset;
- int replacementLength;
- List<CompletionSuggestion> suggestions = [];
- bool suggestionsDone = false;
-
- String addTestFile(String content) {
- completionOffset = content.indexOf('^');
- expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
- int nextOffset = content.indexOf('^', completionOffset + 1);
- expect(nextOffset, equals(-1), reason: 'too many ^');
- return super.addTestFile(content.substring(0, completionOffset) +
- content.substring(completionOffset + 1));
- }
-
- void assertHasResult(CompletionSuggestionKind kind, String completion,
- [int relevance = DART_RELEVANCE_DEFAULT,
- bool isDeprecated = false,
- bool isPotential = false]) {
- var cs;
- suggestions.forEach((s) {
- if (s.completion == completion) {
- if (cs == null) {
- cs = s;
- } else {
- fail('expected exactly one $completion but found > 1');
- }
- }
- });
- if (cs == null) {
- 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');
- }
- }
-
- void assertValidId(String id) {
- expect(id, isNotNull);
- expect(id.isNotEmpty, isTrue);
- }
-
- @override
- Index createIndex() {
- return createLocalMemoryIndex();
- }
-
- Future getSuggestions(Map<String, List<String>> selectorRelevance) async {
- await waitForTasksFinished();
- CompletionGetSuggestionsParams params =
- new CompletionGetSuggestionsParams(testFile, completionOffset);
- Request request = params.toRequest('0');
- CompletionDomainHandler domainHandler = new CompletionDomainHandler(server);
- handler = domainHandler;
-
- ContextSourcePair contextSource = server.getContextSourcePair(params.file);
- AnalysisContext context = contextSource.context;
- Source source = contextSource.source;
- DartCompletionManager completionManager = new DartCompletionManager(
- context,
- server.searchEngine,
- source,
- server.serverPlugin.completionContributors,
- new CommonUsageSorter(selectorRelevance));
-
- Response response =
- domainHandler.processRequest(request, completionManager);
- expect(response, isResponseSuccess('0'));
- completionId = response.id;
- assertValidId(completionId);
- await pumpEventQueue();
- expect(suggestionsDone, isTrue);
- }
-
- void processNotification(Notification notification) {
- if (notification.event == COMPLETION_RESULTS) {
- var params = new CompletionResultsParams.fromNotification(notification);
- String id = params.id;
- assertValidId(id);
- if (id == completionId) {
- expect(suggestionsDone, isFalse);
- replacementOffset = params.replacementOffset;
- replacementLength = params.replacementLength;
- suggestionsDone = params.isLast;
- expect(suggestionsDone, isNotNull);
- suggestions = params.results;
- }
+class CommonUsageSorterTest extends AbstractCompletionDomainTest {
+ Future getSuggestionsWith(Map<String, List<String>> selectorRelevance) async {
+ var originalSorter = DartCompletionManager.contributionSorter;
+ DartCompletionManager.contributionSorter =
+ new CommonUsageSorter(selectorRelevance);
+ try {
+ return await getSuggestions();
+ } finally {
+ DartCompletionManager.contributionSorter = originalSorter;
}
}
- @override
- void setUp() {
- super.setUp();
- createProject();
- }
-
test_ConstructorName() async {
// SimpleIdentifier ConstructorName InstanceCreationExpression
addTestFile('import "dart:async"; class A {x() {new Future.^}}');
- await getSuggestions({
+ await getSuggestionsWith({
'dart.async.Future': ['value', 'wait']
});
expect(replacementOffset, equals(completionOffset));
expect(replacementLength, equals(0));
assertHasResult(CompletionSuggestionKind.INVOCATION, 'delayed');
assertHasResult(CompletionSuggestionKind.INVOCATION, 'value',
- DART_RELEVANCE_COMMON_USAGE);
+ relevance: DART_RELEVANCE_COMMON_USAGE);
assertNoResult('Future');
assertNoResult('Object');
assertNoResult('A');
@@ -158,14 +53,14 @@ class CommonUsageSorterTest extends AbstractAnalysisTest {
test_PrefixedIdentifier_field() async {
// SimpleIdentifier PrefixedIdentifeir ExpressionStatement
addTestFile('class A {static int s1; static int s2; x() {A.^}}');
- await getSuggestions({
+ await getSuggestionsWith({
'.A': ['s2']
});
expect(replacementOffset, equals(completionOffset));
expect(replacementLength, equals(0));
assertHasResult(CompletionSuggestionKind.INVOCATION, 's1');
- assertHasResult(
- CompletionSuggestionKind.INVOCATION, 's2', DART_RELEVANCE_COMMON_USAGE);
+ assertHasResult(CompletionSuggestionKind.INVOCATION, 's2',
+ relevance: DART_RELEVANCE_COMMON_USAGE);
assertNoResult('Future');
assertNoResult('Object');
assertNoResult('A');
@@ -176,13 +71,13 @@ class CommonUsageSorterTest extends AbstractAnalysisTest {
addFile('/project/bin/myLib.dart',
'library L; part "$testFile"; class A {static int s2;}');
addTestFile('part of L; foo() {A.^}');
- await getSuggestions({
+ await getSuggestionsWith({
'L.A': ['s2']
});
expect(replacementOffset, equals(completionOffset));
expect(replacementLength, equals(0));
- assertHasResult(
- CompletionSuggestionKind.INVOCATION, 's2', DART_RELEVANCE_COMMON_USAGE);
+ assertHasResult(CompletionSuggestionKind.INVOCATION, 's2',
+ relevance: DART_RELEVANCE_COMMON_USAGE);
assertNoResult('Future');
assertNoResult('Object');
assertNoResult('A');
@@ -191,14 +86,14 @@ class CommonUsageSorterTest extends AbstractAnalysisTest {
test_PrefixedIdentifier_getter() async {
// SimpleIdentifier PrefixedIdentifeir ExpressionStatement
addTestFile('class A {int get g1 => 1; int get g2 => 2; x() {new A().^}}');
- await getSuggestions({
+ await getSuggestionsWith({
'.A': ['g2']
});
expect(replacementOffset, equals(completionOffset));
expect(replacementLength, equals(0));
assertHasResult(CompletionSuggestionKind.INVOCATION, 'g1');
- assertHasResult(
- CompletionSuggestionKind.INVOCATION, 'g2', DART_RELEVANCE_COMMON_USAGE);
+ assertHasResult(CompletionSuggestionKind.INVOCATION, 'g2',
+ relevance: DART_RELEVANCE_COMMON_USAGE);
assertNoResult('Future');
assertNoResult('Object');
assertNoResult('A');
@@ -207,14 +102,14 @@ class CommonUsageSorterTest extends AbstractAnalysisTest {
test_PrefixedIdentifier_setter() async {
// SimpleIdentifier PrefixedIdentifeir ExpressionStatement
addTestFile('class A {set s1(v) {}; set s2(v) {}; x() {new A().^}}');
- await getSuggestions({
+ await getSuggestionsWith({
'.A': ['s2']
});
expect(replacementOffset, equals(completionOffset));
expect(replacementLength, equals(0));
assertHasResult(CompletionSuggestionKind.INVOCATION, 's1');
- assertHasResult(
- CompletionSuggestionKind.INVOCATION, 's2', DART_RELEVANCE_COMMON_USAGE);
+ assertHasResult(CompletionSuggestionKind.INVOCATION, 's2',
+ relevance: DART_RELEVANCE_COMMON_USAGE);
assertNoResult('Future');
assertNoResult('Object');
assertNoResult('A');
@@ -223,13 +118,13 @@ class CommonUsageSorterTest extends AbstractAnalysisTest {
test_PrefixedIdentifier_static_method() async {
// SimpleIdentifier PrefixedIdentifeir ExpressionStatement
addTestFile('import "dart:async"; class A {x() {Future.^}}');
- await getSuggestions({
+ await getSuggestionsWith({
'dart.async.Future': ['value', 'wait']
});
expect(replacementOffset, equals(completionOffset));
expect(replacementLength, equals(0));
assertHasResult(CompletionSuggestionKind.INVOCATION, 'wait',
- DART_RELEVANCE_COMMON_USAGE - 1);
+ relevance: DART_RELEVANCE_COMMON_USAGE - 1);
assertNoResult('Future');
assertNoResult('Object');
assertNoResult('A');
@@ -238,16 +133,16 @@ class CommonUsageSorterTest extends AbstractAnalysisTest {
test_PropertyAccess() async {
// SimpleIdentifier PropertyAccess ExpressionStatement
addTestFile('import "dart:math"; class A {x() {new Random().^}}');
- await getSuggestions({
+ await getSuggestionsWith({
'dart.math.Random': ['nextInt', 'nextDouble']
});
expect(replacementOffset, equals(completionOffset));
expect(replacementLength, equals(0));
assertHasResult(CompletionSuggestionKind.INVOCATION, 'nextBool');
assertHasResult(CompletionSuggestionKind.INVOCATION, 'nextDouble',
- DART_RELEVANCE_COMMON_USAGE - 1);
+ relevance: DART_RELEVANCE_COMMON_USAGE - 1);
assertHasResult(CompletionSuggestionKind.INVOCATION, 'nextInt',
- DART_RELEVANCE_COMMON_USAGE);
+ relevance: DART_RELEVANCE_COMMON_USAGE);
assertNoResult('Random');
assertNoResult('Object');
assertNoResult('A');
« no previous file with comments | « pkg/analysis_server/test/domain_completion_util.dart ('k') | pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698