DAS: Remove a mock PluginInfo; can use the real one instead

Change-Id: I4c1cdb879f5f0d3370752721298a9b089db5e849
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445523
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: srawlins

pkg/analysis_server/test/edit/assists_test.dart

@@ -14,7 +14,7 @@ import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../analysis_server_base.dart';
-import '../src/plugin/plugin_manager_test.dart';
+import '../mocks.dart';
 
 void main() {
   defineReflectiveSuite(() {

pkg/analysis_server/test/edit/fixes_test.dart

@@ -18,7 +18,7 @@ import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../analysis_server_base.dart';
-import '../src/plugin/plugin_manager_test.dart';
+import '../mocks.dart';
 
 void main() {
   defineReflectiveSuite(() {

pkg/analysis_server/test/mocks.dart

@@ -8,8 +8,11 @@ import 'dart:io';
 
 import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol_generated.dart';
+import 'package:analysis_server/src/plugin/notification_manager.dart';
 import 'package:analysis_server/src/utilities/process.dart';
 import 'package:analyzer/source/source.dart';
+import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
+import 'package:analyzer_plugin/protocol/protocol_common.dart' as protocol;
 import 'package:http/http.dart' as http;
 import 'package:test/test.dart';
 
@@ -136,14 +139,38 @@ class MockSource implements Source {
   String toString() => fullName;
 }
 
-class StringTypedMock {
-  final String? _toString;
+class TestNotificationManager implements AbstractNotificationManager {
+  List<plugin.Notification> notifications = [];
 
-  StringTypedMock(this._toString);
+  Map<String, Map<String, List<protocol.AnalysisError>>> recordedErrors = {};
+
+  List<String> pluginErrors = [];
+
+  @override
+  void handlePluginError(String message) {
+    pluginErrors.add(message);
+  }
 
   @override
-  String toString() {
-    return _toString ?? super.toString();
+  void handlePluginNotification(
+    String pluginId,
+    plugin.Notification notification,
+  ) {
+    notifications.add(notification);
+  }
+
+  @override
+  dynamic noSuchMethod(Invocation invocation) {
+    fail('Unexpected invocation of ${invocation.memberName}');
+  }
+
+  @override
+  void recordAnalysisErrors(
+    String pluginId,
+    String filePath,
+    List<protocol.AnalysisError> errorData,
+  ) {
+    recordedErrors.putIfAbsent(pluginId, () => {})[filePath] = errorData;
   }
 }
 

pkg/analysis_server/test/src/analytics/analytics_manager_test.dart

@@ -11,8 +11,8 @@ import 'package:analysis_server/src/analytics/percentile_calculator.dart';
 import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
-import 'package:analyzer/dart/analysis/context_root.dart' as analyzer;
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/instrumentation/service.dart';
 import 'package:analyzer/src/test_utilities/mock_sdk.dart';
 import 'package:analyzer_testing/resource_provider_mixin.dart';
 import 'package:http/src/response.dart' as http;
@@ -24,6 +24,8 @@ import 'package:unified_analytics/src/constants.dart';
 import 'package:unified_analytics/src/enums.dart';
 import 'package:unified_analytics/unified_analytics.dart';
 
+import '../../mocks.dart';
+
 void main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(AnalyticsManagerTest);
@@ -494,8 +496,12 @@ class AnalyticsManagerTest with ResourceProviderMixin {
 
   DateTime _now() => DateTime.now();
 
-  _MockPluginInfo _pluginInfo(String name) => _MockPluginInfo(
+  PluginInfo _pluginInfo(String name) => PluginInfo(
     path.join('.pub-cache', 'pub.dev', name, 'tools', 'analyzer_plugin'),
+    '/some/execution/path',
+    '/some/packages/path',
+    TestNotificationManager(),
+    InstrumentationService.NULL_SERVICE,
   );
 }
 
@@ -673,19 +679,6 @@ class _MockAnalytics implements NoOpAnalytics {
   void suppressTelemetry() {}
 }
 
-class _MockPluginInfo implements PluginInfo {
-  @override
-  String pluginId;
-
-  _MockPluginInfo(this.pluginId);
-
-  @override
-  Set<analyzer.ContextRoot> get contextRoots => {};
-
-  @override
-  dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
-}
-
 class _MockPluginManager implements PluginManager {
   @override
   List<PluginInfo> plugins;

pkg/analysis_server/test/src/plugin/plugin_manager_test.dart

@@ -4,7 +4,6 @@
 
 import 'dart:io' as io;
 
-import 'package:analysis_server/src/plugin/notification_manager.dart';
 import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
@@ -24,11 +23,12 @@ import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 import 'package:watcher/watcher.dart' as watcher;
 
+import '../../mocks.dart';
 import '../../support/sdk_paths.dart';
 
 void main() {
   defineReflectiveSuite(() {
-    defineReflectiveTests(DiscoveredPluginInfoTest);
+    defineReflectiveTests(PluginInfoTest);
     defineReflectiveTests(PluginManagerTest);
     defineReflectiveTests(PluginManagerFromDiskTest);
     defineReflectiveTests(PluginSessionTest);
@@ -37,7 +37,7 @@ void main() {
 }
 
 @reflectiveTest
-class DiscoveredPluginInfoTest with ResourceProviderMixin, _ContextRoot {
+class PluginInfoTest with ResourceProviderMixin, _ContextRoot {
   late TestNotificationManager notificationManager;
   String pluginPath = '/pluginDir';
   String executionPath = '/pluginDir/bin/plugin.dart';
@@ -859,43 +859,6 @@ class MinimalPlugin extends ServerPlugin {
   }
 }
 
-class TestNotificationManager implements AbstractNotificationManager {
-  List<Notification> notifications = <Notification>[];
-
-  Map<String, Map<String, List<AnalysisError>>> recordedErrors =
-      <String, Map<String, List<AnalysisError>>>{};
-
-  List<String> pluginErrors = [];
-
-  @override
-  void handlePluginError(String message) {
-    pluginErrors.add(message);
-  }
-
-  @override
-  void handlePluginNotification(String pluginId, Notification notification) {
-    notifications.add(notification);
-  }
-
-  @override
-  dynamic noSuchMethod(Invocation invocation) {
-    fail('Unexpected invocation of ${invocation.memberName}');
-  }
-
-  @override
-  void recordAnalysisErrors(
-    String pluginId,
-    String filePath,
-    List<AnalysisError> errorData,
-  ) {
-    recordedErrors.putIfAbsent(
-          pluginId,
-          () => <String, List<AnalysisError>>{},
-        )[filePath] =
-        errorData;
-  }
-}
-
 class TestServerCommunicationChannel implements ServerCommunicationChannel {
   final PluginSession session;
   int closeCount = 0;