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

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

Issue 2572203002: Add completion tests for the new analysis driver. (Closed)
Patch Set: Created 4 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
Index: pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
index 1a5fac833139141a90fb7070f9a3577f34038132..62deed1819cbcb9eebc2cc217530bd1bda672dfe 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
@@ -18,6 +18,7 @@ import 'package:analysis_server/src/services/completion/dart/completion_manager.
show DartCompletionRequestImpl, ReplacementRange;
import 'package:analysis_server/src/services/index/index.dart';
import 'package:analysis_server/src/services/search/search_engine_internal.dart';
+import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/task/dart.dart';
import 'package:test/test.dart';
@@ -217,8 +218,8 @@ abstract class DartCompletionContributorTest extends AbstractContextTest {
CompletionSuggestion assertSuggestEnumConst(String completion,
{int relevance: DART_RELEVANCE_DEFAULT, bool isDeprecated: false}) {
- CompletionSuggestion suggestion =
- assertSuggest(completion, relevance: relevance, isDeprecated: isDeprecated);
+ CompletionSuggestion suggestion = assertSuggest(completion,
+ relevance: relevance, isDeprecated: isDeprecated);
expect(suggestion.completion, completion);
expect(suggestion.isDeprecated, isDeprecated);
expect(suggestion.element.kind, protocol.ElementKind.ENUM_CONSTANT);
@@ -452,10 +453,16 @@ abstract class DartCompletionContributorTest extends AbstractContextTest {
}
Future computeSuggestions([int times = 200]) async {
- context.analysisPriorityOrder = [testSource];
+ AnalysisResult analysisResult = null;
+ if (enableNewAnalysisDriver) {
+ analysisResult = await driver.getResult(testFile);
+ testSource = analysisResult.unit.element.source;
+ } else {
+ context.analysisPriorityOrder = [testSource];
+ }
CompletionRequestImpl baseRequest = new CompletionRequestImpl(
- null,
- context,
+ analysisResult,
+ enableNewAnalysisDriver ? null: context,
provider,
searchEngine,
testSource,
@@ -537,14 +544,18 @@ abstract class DartCompletionContributorTest extends AbstractContextTest {
return cs;
}
- Future/*<E>*/ performAnalysis/*<E>*/(int times, Completer/*<E>*/ completer) {
+ Future/*<E>*/ performAnalysis/*<E>*/(int times, Completer/*<E>*/ completer) async {
if (completer.isCompleted) {
return completer.future;
}
- if (times == 0 || context == null) {
- return new Future.value();
+ if (enableNewAnalysisDriver) {
+ // Just wait.
+ } else {
+ if (times == 0 || context == null) {
+ return new Future.value();
+ }
+ context.performAnalysisTask();
}
- context.performAnalysisTask();
// We use a delayed future to allow microtask events to finish. The
// Future.value or Future() constructors use scheduleMicrotask themselves and
// would therefore not wait for microtask callbacks that are scheduled after

Powered by Google App Engine
This is Rietveld 408576698