[cq] Using TestCode and normalizeSource for quick-fix tests

This change introduces `TestCode` and `normalizeSource` into the tests for quick fixes. The goal is to add these capabilities to `AbstractSingleUnitTest`, allowing a future update to replace offsets in tests with markers.

Bug: #60234
Change-Id: I760e6b5fb13b37d4e35278073a78f4d755deda64
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/415260
Reviewed-by: Phil Quitslund <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: FMorschel

pkg/analysis_server/test/abstract_single_unit.dart

@@ -10,6 +10,7 @@ import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/error/codes.g.dart';
 import 'package:analyzer/src/test_utilities/find_element2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
+import 'package:analyzer/src/test_utilities/test_code_format.dart';
 import 'package:analyzer/src/utilities/extensions/analysis_session.dart';
 import 'package:test/test.dart';
 
@@ -18,19 +19,32 @@ import 'abstract_context.dart';
 class AbstractSingleUnitTest extends AbstractContextTest {
   bool verifyNoTestUnitErrors = true;
 
-  late String testCode;
+  TestCode? _parsedTestCode;
   late ParsedUnitResult testParsedResult;
   late ResolvedLibraryResult? testLibraryResult;
   late ResolvedUnitResult testAnalysisResult;
   late CompilationUnit testUnit;
   late FindNode findNode;
   late FindElement2 findElement2;
-
   late LibraryElement2 testLibraryElement;
+  TestCode get parsedTestCode => _parsedTestCode!;
+  set parsedTestCode(TestCode value) {
+    if (_parsedTestCode != null) {
+      throw ArgumentError(
+        'parsedTestCode is already set to ${_parsedTestCode!.code}',
+      );
+    }
+    _parsedTestCode = value;
+  }
+
+  String get testCode => parsedTestCode.code;
+  set testCode(String value) {
+    parsedTestCode = TestCode.parse(normalizeSource(value));
+  }
 
   void addTestSource(String code) {
     testCode = code;
-    newFile(testFile.path, code);
+    newFile(testFile.path, testCode);
   }
 
   int findEnd(String search) {
@@ -95,4 +109,12 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   Future<void> resolveTestFile() async {
     await getResolvedUnit(testFile);
   }
+
+  void updateTestSource(String code) {
+    if (_parsedTestCode == null) {
+      throw StateError('testCode is not set');
+    }
+    _parsedTestCode = null;
+    addTestSource(code);
+  }
 }

pkg/analysis_server/test/services/completion/statement/statement_completion_test.dart

@@ -1051,7 +1051,7 @@ void f() {
 ''', (s) => _afterLast(s, '  '));
   }
 
-  Future<void> test_noCloseParenWithSemicolon() async {
+  Future<void> test_noCloseParenWithSemicolon1() async {
     var before = '''
 void f() {
   var s = 'sample'.substring(3;
@@ -1063,13 +1063,28 @@ void f() {
   ////
 }
 ''';
-    // Check completion both before and after the semicolon.
+    // Check completion both before semicolon.
     await _prepareCompletion('ing(3', before, atEnd: true);
     _assertHasChange(
       'Insert a newline at the end of the current line',
       after,
       (s) => _afterLast(s, '  '),
     );
+  }
+
+  Future<void> test_noCloseParenWithSemicolon2() async {
+    var before = '''
+void f() {
+  var s = 'sample'.substring(3;
+}
+''';
+    var after = '''
+void f() {
+  var s = 'sample'.substring(3);
+  ////
+}
+''';
+    // Check completion after the semicolon.
     await _prepareCompletion('ing(3;', before, atEnd: true);
     _assertHasChange(
       'Insert a newline at the end of the current line',

pkg/analysis_server/test/services/correction/organize_directives_test.dart

@@ -318,25 +318,85 @@ void f() {
 }''', removeUnused: true);
   }
 
-  Future<void> test_remove_unusedImports_hasUnresolvedError() async {
-    Future<void> check(String declaration) async {
-      var code = '''
+  Future<void> test_remove_unusedImports_hasUnresolvedError1() async {
+    var code = '''
 import 'dart:async';
-$declaration
+void f() { Unresolved v; }
 ''';
-      await _computeUnitAndErrors(code);
-      _assertOrganize(code, removeUnused: true);
-    }
-
-    await check('void f() { Unresolved v; }');
-    await check('void f() { new Unresolved(); }');
-    await check('void f() { const Unresolved(); }');
-    await check('void f() { unresolvedFunction(); }');
-    await check('void f() { print(unresolvedVariable); }');
-    await check('void f() { unresolvedVariable = 0; }');
-    await check('void f() { Unresolved.field = 0; }');
-    await check('class A extends Unresolved {}');
-    await check('List<Unresolved> v;');
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError2() async {
+    var code = '''
+import 'dart:async';
+void f() { new Unresolved(); }
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError3() async {
+    var code = '''
+import 'dart:async';
+void f() { const Unresolved(); }
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError4() async {
+    var code = '''
+import 'dart:async';
+void f() { unresolvedFunction(); }
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError5() async {
+    var code = '''
+import 'dart:async';
+void f() { print(unresolvedVariable); }
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError6() async {
+    var code = '''
+import 'dart:async';
+void f() { unresolvedVariable = 0; }
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError7() async {
+    var code = '''
+import 'dart:async';
+void f() { Unresolved.field = 0; }
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError8() async {
+    var code = '''
+import 'dart:async';
+class A extends Unresolved {}
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
+  }
+
+  Future<void> test_remove_unusedImports_hasUnresolvedError9() async {
+    var code = '''
+import 'dart:async';
+List<Unresolved> v;
+''';
+    await _computeUnitAndErrors(code);
+    _assertOrganize(code, removeUnused: true);
   }
 
   Future<void> test_sort() async {

pkg/analysis_server/test/services/refactoring/legacy/extract_local_test.dart

@@ -411,15 +411,15 @@ void f() {
   Future<void> test_const_inList_inPrefixExpression() async {
     await indexTestUnit('''
 void f() {
-  const [!true, 2];
+  const [ !true, 2];
 }
 ''');
     _createRefactoringForString('true');
     // apply refactoring
     return _assertSuccessfulRefactoring('''
 void f() {
   const res = true;
-  const [!res, 2];
+  const [ !res, 2];
 }
 ''');
   }

pkg/analysis_server/test/src/computer/call_hierarchy_computer_test.dart

@@ -1039,7 +1039,7 @@ void two() {
     expect(calls, isNotEmpty);
 
     // Modify the file so that the target offset is no longer the original item.
-    addTestSource(testCode.replaceAll('one()', 'three()'));
+    updateTestSource(testCode.replaceAll('one()', 'three()'));
 
     // Ensure there are now no results for the original target.
     calls = await findIncomingCallsForTarget(target);
@@ -1790,7 +1790,7 @@ void two() {}
     expect(calls, isNotEmpty);
 
     // Modify the file so that the target offset is no longer the original item.
-    addTestSource(testCode.replaceAll('one()', 'three()'));
+    updateTestSource(testCode.replaceAll('one()', 'three()'));
 
     // Ensure there are now no results for the original target.
     calls = await findOutgoingCallsForTarget(target);