[analysis_server] Update CodeActions tests + mixin to use shared test interface

No functional changes, this is just a small refactor extracting from a future CL that makes the LSP CodeActions tests (and the supporting mixin) work against the `SharedTestInterface` so that they can be shared between the LSP server and Legacy server tests.

It also removes a redundant implementation of `verifyEdit` so both LSP+Legacy tests can use the same implementation, which required fixing the LspOverLegacy base test class to correctly set the local capabilities to match the default set the legacy server uses if the client doesn't provide any explicitly.

Change-Id: Ie6396a6425205aba9bfdcc3f08f34fdfa215ad92
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428002
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: DanTup

pkg/analysis_server/test/lsp/code_actions_assists_test.dart

@@ -28,7 +28,7 @@ void main() {
 
 @reflectiveTest
 class AssistsCodeActionsTest extends AbstractLspAnalysisServerTest
-    with CodeActionsTestMixin {
+    with LspSharedTestMixin, CodeActionsTestMixin {
   @override
   void setUp() {
     super.setUp();
@@ -107,7 +107,7 @@ Widget build() {
     expect(action.isCodeActionLiteral, true);
 
     await verifyCodeActionEdits(action, r'''
->>>>>>>>>> lib/main.dart
+>>>>>>>>>> lib/test.dart
 import 'package:flutter/widgets.dart';
 Widget build() {
   return Center($0child: Text(''));
@@ -133,7 +133,7 @@ Widget build() {
       command: Commands.applyCodeAction,
       commandArgs: [
         {
-          'textDocument': {'uri': mainFileUri.toString(), 'version': 1},
+          'textDocument': {'uri': testFileUri.toString(), 'version': 1},
           'range': code.range.range.toJson(),
           'kind': 'refactor.flutter.wrap.center',
           'loggedAction': 'dart.assist.flutter.wrap.center',
@@ -148,7 +148,7 @@ Widget build() {
     // Verify that executing the command produces the correct edits (which will
     // come back via `workspace/applyEdit`).
     await verifyCommandEdits(command, r'''
->>>>>>>>>> lib/main.dart
+>>>>>>>>>> lib/test.dart
 import 'package:flutter/widgets.dart';
 Widget build() {
   return Center($0child: Text(''));
@@ -169,15 +169,15 @@ Widget build() {
     // indicating this is not a valid (Dart) int.
     // https://github.com/dart-lang/sdk/issues/42786
 
-    newFile(mainFilePath, '');
+    newFile(testFilePath, '');
     await initialize();
 
     var request = makeRequest(
       Method.textDocument_codeAction,
       _RawParams('''
       {
         "textDocument": {
-          "uri": "$mainFileUri"
+          "uri": "$testFileUri"
         },
         "context": {
           "diagnostics": []
@@ -283,7 +283,7 @@ bar
           "Change 'foo' to 'bar'",
           edits: [
             plugin.SourceFileEdit(
-              mainFilePath,
+              testFilePath,
               0,
               edits: [plugin.SourceEdit(0, 3, 'bar')],
             ),
@@ -329,11 +329,11 @@ bar
               request is plugin.EditGetAssistsParams ? pluginResult : null,
     );
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       range: code.range.range,
     );
     var codeActionTitles = codeActions.map((action) => action.title);
@@ -512,11 +512,11 @@ import 'package:flutter/widgets.dart';
 build() => Contai^ner(child: Container());
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       position: code.position.position,
     );
     var codeActionTitles = codeActions.map((action) => action.title);

pkg/analysis_server/test/lsp/code_actions_fixes_test.dart

@@ -49,7 +49,7 @@ class DeprecatedCamelCaseTypes extends LintRule {
 
 @reflectiveTest
 class FixesCodeActionsTest extends AbstractLspAnalysisServerTest
-    with CodeActionsTestMixin {
+    with LspSharedTestMixin, CodeActionsTestMixin {
   /// Helper to check plugin fixes for [filePath].
   ///
   /// Used to ensure that both Dart and non-Dart files fixes are returned.
@@ -129,11 +129,11 @@ bar
 MyCla^ss? a;
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       position: code.position.position,
     );
     var codeActionTitles = codeActions.map((action) => action.title);
@@ -157,11 +157,11 @@ MyCla^ss? a;
 MyCla^ss? a;
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       position: code.position.position,
     );
     var codeActionTitles = codeActions.map((action) => action.title);
@@ -181,11 +181,11 @@ MyCla^ss? a;
 MyCla^ss? a;
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       position: code.position.position,
     );
     var codeActionTitles = codeActions.map((action) => action.title);
@@ -317,11 +317,11 @@ import 'dart:async';
 
 Future foo;
 ''');
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     ofKind(CodeActionKind kind) =>
-        getCodeActions(mainFileUri, range: code.range.range, kinds: [kind]);
+        getCodeActions(testFileUri, range: code.range.range, kinds: [kind]);
 
     // The code above will return a 'quickfix.remove.unusedImport'.
     expect(await ofKind(CodeActionKind.QuickFix), isNotEmpty);
@@ -358,10 +358,10 @@ var a = [!foo!]();
 var b = bar();
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
-    var allFixes = await getCodeActions(mainFileUri, range: code.range.range);
+    var allFixes = await getCodeActions(testFileUri, range: code.range.range);
 
     // Expect only the single-fix, there should be no apply-all.
     expect(allFixes, hasLength(1));
@@ -446,12 +446,12 @@ void main() {
 }
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var position = code.position.position;
     var range = Range(start: position, end: position);
-    var codeActions = await getCodeActions(mainFileUri, range: range);
+    var codeActions = await getCodeActions(testFileUri, range: range);
     var codeActionKinds = codeActions.map(
       (item) =>
           item.map((literal) => literal.kind?.toString(), (command) => null),
@@ -536,11 +536,11 @@ Future foo;
     var code = TestCode.parse('''
 [!import!] 'dart:convert';
 ''');
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       range: code.range.range,
     );
     var fixAction =
@@ -572,11 +572,11 @@ int foo() {
 }
     ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       range: code.range.range,
     );
     var fixAction = findCodeActionLiteral(
@@ -600,11 +600,11 @@ void f() {
 }
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       position: code.position.position,
     );
     var removeNnaAction =
@@ -628,11 +628,11 @@ void f() {
 var a = [Test, Test, Te[!!]st];
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       range: code.range.range,
     );
     var createClassAction =
@@ -654,11 +654,11 @@ var a = [Test, Test, Te[!!]st];
 var a = [Test, Test, Te[!!]st];
 ''');
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       range: code.range.range,
     );
     var createClassActions =
@@ -719,7 +719,7 @@ ProcessInfo b;
 
   Future<void> test_plugin_dart() async {
     if (!AnalysisServer.supportsPlugins) return;
-    return await checkPluginResults(mainFilePath);
+    return await checkPluginResults(testFilePath);
   }
 
   Future<void> test_plugin_nonDart() async {
@@ -741,7 +741,7 @@ ProcessInfo b;
         plugin.AnalysisError(
           plugin.AnalysisErrorSeverity.ERROR,
           plugin.AnalysisErrorType.HINT,
-          plugin.Location(mainFilePath, 0, 3, 0, 0),
+          plugin.Location(testFilePath, 0, 3, 0, 0),
           'Dummy error',
           'dummy',
         ),
@@ -757,11 +757,11 @@ ProcessInfo b;
               request is plugin.EditGetFixesParams ? pluginResult : null,
     );
 
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     var codeActions = await getCodeActions(
-      mainFileUri,
+      testFileUri,
       range: code.range.range,
     );
     var codeActionTitles = codeActions.map((action) => action.title);

pkg/analysis_server/test/lsp/code_actions_mixin.dart

@@ -9,12 +9,18 @@ import 'package:analyzer/src/test_utilities/test_code_format.dart';
 import 'package:collection/collection.dart';
 import 'package:test/test.dart';
 
+import '../shared/shared_test_interface.dart';
 import '../utils/lsp_protocol_extensions.dart';
 import '../utils/test_code_extensions.dart';
 import 'change_verifier.dart';
-import 'server_abstract.dart';
+import 'request_helpers_mixin.dart';
 
-mixin CodeActionsTestMixin on AbstractLspAnalysisServerTest {
+mixin CodeActionsTestMixin
+    on
+        SharedTestInterface,
+        LspRequestHelpersMixin,
+        LspEditHelpersMixin,
+        LspVerifyEditHelpersMixin {
   /// Initializes the server with some basic configuration and expects to find
   /// a [CodeAction] with [kind]/[command]/[title].
   Future<CodeAction> expectCodeAction(
@@ -27,10 +33,10 @@ mixin CodeActionsTestMixin on AbstractLspAnalysisServerTest {
     String? filePath,
     bool openTargetFile = false,
   }) async {
-    filePath ??= mainFilePath;
-    newFile(filePath, code.code);
+    filePath ??= testFilePath;
+    createFile(filePath, code.code);
 
-    await initialize();
+    await initializeServer();
 
     var fileUri = uriConverter.toClientUri(filePath);
     if (openTargetFile) {
@@ -92,14 +98,14 @@ mixin CodeActionsTestMixin on AbstractLspAnalysisServerTest {
     String? title,
     ProgressToken? workDoneToken,
   }) async {
-    filePath ??= mainFilePath;
+    filePath ??= testFilePath;
     var code = TestCode.parse(content);
-    newFile(filePath, code.code);
+    createFile(filePath, code.code);
 
     if (workDoneToken != null) {
       setWorkDoneProgressSupport();
     }
-    await initialize();
+    await initializeServer();
 
     var codeActions = await getCodeActions(
       uriConverter.toClientUri(filePath),
@@ -265,7 +271,7 @@ mixin CodeActionsTestMixin on AbstractLspAnalysisServerTest {
     ProgressToken? commandWorkDoneToken,
     bool openTargetFile = false,
   }) async {
-    filePath ??= mainFilePath;
+    filePath ??= testFilePath;
 
     // For convenience, if a test doesn't provide an full set of edits
     // we assume only a single edit of the file that was being modified.

pkg/analysis_server/test/lsp/code_actions_refactor_test.dart

@@ -151,7 +151,7 @@ void f() {
 }
 ''';
     const expectedContent = '''
->>>>>>>>>> lib/main.dart
+>>>>>>>>>> lib/test.dart
 void f() {
   print('Test!');
   newMethod();
@@ -223,7 +223,7 @@ void f() {
     try {
       // Send an edit request immediately after the refactor request.
       var req1 = executeCommand(codeAction.command!);
-      var req2 = replaceFile(100, mainFileUri, '// new test content');
+      var req2 = replaceFile(100, testFileUri, '// new test content');
       completer.complete();
 
       // Expect the first to fail because of the modified content.
@@ -249,11 +249,11 @@ void f() {
 }
 ''';
     var code = TestCode.parse(content);
-    newFile(mainFilePath, code.code);
+    newFile(testFilePath, code.code);
     await initialize();
 
     ofKind(CodeActionKind kind) =>
-        getCodeActions(mainFileUri, range: code.range.range, kinds: [kind]);
+        getCodeActions(testFileUri, range: code.range.range, kinds: [kind]);
 
     // The code above will return a 'refactor.extract' (as well as some other
     // refactors, but not rewrite).
@@ -979,7 +979,7 @@ void foo2() {
 }
 
 abstract class RefactorCodeActionsTest extends AbstractLspAnalysisServerTest
-    with CodeActionsTestMixin {
+    with LspSharedTestMixin, CodeActionsTestMixin {
   @override
   void setUp() {
     super.setUp();