Use mock of AnalysisResult in analyzer_plugin.
R=brianwilkerson@google.com, paulberry@google.com
Change-Id: Ia185d6f24d3cd250dc0b42aecb64aea482e0a46a
Reviewed-on: https://dart-review.googlesource.com/58841
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart
index b982527..41d20c1 100644
--- a/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/assist_mixin_test.dart
@@ -90,8 +90,7 @@
@override
Future<AssistRequest> getAssistRequest(
EditGetAssistsParams parameters) async {
- AnalysisResult result = new AnalysisResult(
- null, null, null, null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult();
return new DartAssistRequestImpl(
resourceProvider, parameters.offset, parameters.length, result);
}
diff --git a/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart
index 2132a89..acd15aa 100644
--- a/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/completion_mixin_test.dart
@@ -98,8 +98,7 @@
@override
Future<CompletionRequest> getCompletionRequest(
CompletionGetSuggestionsParams parameters) async {
- AnalysisResult result = new AnalysisResult(
- null, null, null, null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult();
return new DartCompletionRequestImpl(
resourceProvider, parameters.offset, result);
}
diff --git a/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart
index 8b7182e..a30418e 100644
--- a/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/fix_mixin_test.dart
@@ -98,8 +98,8 @@
int offset = parameters.offset;
AnalysisError error = new AnalysisError(
new MockSource(), 0, 0, CompileTimeErrorCode.AWAIT_IN_WRONG_CONTEXT);
- AnalysisResult result = new AnalysisResult(null, null, null, null, null,
- null, new LineInfo([0, 20]), false, null, null, [error], null);
+ AnalysisResult result = new MockAnalysisResult(
+ lineInfo: new LineInfo([0, 20]), errors: [error]);
return new DartFixesRequestImpl(resourceProvider, offset, [error], result);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart
index ce80ba8..cedc947 100644
--- a/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/folding_mixin_test.dart
@@ -93,8 +93,7 @@
@override
Future<FoldingRequest> getFoldingRequest(String path) async {
- AnalysisResult result = new AnalysisResult(
- null, null, path, null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult(path: path);
return new DartFoldingRequestImpl(resourceProvider, result);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart
index 32f855a..992446f 100644
--- a/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/highlights_mixin_test.dart
@@ -93,8 +93,7 @@
@override
Future<HighlightsRequest> getHighlightsRequest(String path) async {
- AnalysisResult result = new AnalysisResult(
- null, null, path, null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult(path: path);
return new DartHighlightsRequestImpl(resourceProvider, result);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart
index 579a974..94f8b4c 100644
--- a/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/kythe_mixin_test.dart
@@ -94,8 +94,7 @@
@override
Future<EntryRequest> getEntryRequest(
KytheGetKytheEntriesParams parameters) async {
- AnalysisResult result = new AnalysisResult(
- null, null, null, null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult();
return new DartEntryRequestImpl(resourceProvider, result);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/mocks.dart b/pkg/analyzer_plugin/test/plugin/mocks.dart
index 1ccb601..3fffc76 100644
--- a/pkg/analyzer_plugin/test/plugin/mocks.dart
+++ b/pkg/analyzer_plugin/test/plugin/mocks.dart
@@ -5,10 +5,12 @@
import 'dart:async';
import 'dart:collection';
+import 'package:analyzer/error/error.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/dart/analysis/file_state.dart';
-import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/engine.dart'
+ show AnalysisOptionsImpl, TimestampedData;
import 'package:analyzer/src/generated/source.dart';
import 'package:analyzer/src/generated/timestamped_data.dart';
import 'package:analyzer_plugin/channel/channel.dart';
@@ -54,6 +56,22 @@
Future<Null> performWork() => new Future.value(null);
}
+class MockAnalysisResult implements AnalysisResult {
+ @override
+ final List<AnalysisError> errors;
+
+ @override
+ final LineInfo lineInfo;
+
+ @override
+ final String path;
+
+ MockAnalysisResult({this.errors, this.lineInfo, this.path});
+
+ @override
+ noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
class MockChannel implements PluginCommunicationChannel {
bool _closed = false;
diff --git a/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart
index a334843..35794aee 100644
--- a/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/navigation_mixin_test.dart
@@ -109,8 +109,7 @@
@override
Future<NavigationRequest> getNavigationRequest(
AnalysisGetNavigationParams parameters) async {
- AnalysisResult result = new AnalysisResult(null, null, parameters.file,
- null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult(path: parameters.file);
return new DartNavigationRequestImpl(
resourceProvider, parameters.offset, parameters.length, result);
}
diff --git a/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart
index f0b56b2..a3c076e 100644
--- a/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/occurrences_mixin_test.dart
@@ -120,8 +120,7 @@
@override
Future<OccurrencesRequest> getOccurrencesRequest(String path) async {
- AnalysisResult result = new AnalysisResult(
- null, null, path, null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult(path: path);
return new DartOccurrencesRequestImpl(resourceProvider, result);
}
}
diff --git a/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart b/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart
index 1e94ef2..70d7620 100644
--- a/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart
+++ b/pkg/analyzer_plugin/test/plugin/outline_mixin_test.dart
@@ -94,8 +94,7 @@
@override
Future<OutlineRequest> getOutlineRequest(String path) async {
- AnalysisResult result = new AnalysisResult(
- null, null, path, null, null, null, null, null, null, null, null, null);
+ AnalysisResult result = new MockAnalysisResult(path: path);
return new DartOutlineRequestImpl(resourceProvider, result);
}
}
