[cq] Reduce assignments to testCode to 1

The purpose for this change is to make it easier to use `TestCode` to
parse the code under test. This, in turn, will allow us to use the same
markdown in all of our test code, making it easier to write and read
our tests. This biggest blocker to that goal is the fact that we assign
to `testCode` in several places, and that's the problem solved by this
change.

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

Author: bwilkerson

pkg/analysis_server/test/abstract_single_unit.dart

@@ -43,29 +43,24 @@ class AbstractSingleUnitTest extends AbstractContextTest {
     return offset;
   }
 
-  @override
-  Future<ParsedUnitResult> getParsedUnit(File file) async {
-    var unitResult = await super.getParsedUnit(file);
-    testParsedResult = unitResult;
-    testCode = unitResult.content;
-    testUnit = unitResult.unit;
-    findNode = FindNode(testCode, testUnit);
-    findElement2 = FindElement2(testUnit);
-    return unitResult;
-  }
-
   @override
   Future<ResolvedUnitResult> getResolvedUnit(File file) async {
     var session = await this.session;
-    testLibraryResult = await session.getResolvedContainingLibrary(file.path);
-    var unitResult = testLibraryResult?.unitWithPath(file.path);
+    var libraryResult = await session.getResolvedContainingLibrary(file.path);
+    var unitResult = libraryResult?.unitWithPath(file.path);
     unitResult ??= await super.getResolvedUnit(file);
-    testAnalysisResult = unitResult;
-    testCode = testAnalysisResult.content;
-    testUnit = testAnalysisResult.unit;
+
+    if (file.path == testFilePath) {
+      testLibraryResult = libraryResult;
+      testAnalysisResult = unitResult;
+      testUnit = unitResult.unit;
+      testLibraryElement = testUnit.declaredFragment!.element;
+      findNode = FindNode(unitResult.content, testUnit);
+      findElement2 = FindElement2(testUnit);
+    }
     if (verifyNoTestUnitErrors) {
       expect(
-        testAnalysisResult.errors.where((AnalysisError error) {
+        unitResult.errors.where((AnalysisError error) {
           return error.errorCode != WarningCode.DEAD_CODE &&
               error.errorCode != WarningCode.UNUSED_CATCH_CLAUSE &&
               error.errorCode != WarningCode.UNUSED_CATCH_STACK &&
@@ -77,16 +72,19 @@ class AbstractSingleUnitTest extends AbstractContextTest {
         isEmpty,
       );
     }
+    return unitResult;
+  }
 
-    testLibraryElement = testUnit.declaredFragment!.element;
+  Future<void> parseTestCode(String code) async {
+    addTestSource(code);
+    testParsedResult = await getParsedUnit(testFile);
+    testUnit = testParsedResult.unit;
     findNode = FindNode(testCode, testUnit);
     findElement2 = FindElement2(testUnit);
-    return testAnalysisResult;
   }
 
-  Future<void> parseTestCode(String code) async {
-    addTestSource(code);
-    await getParsedUnit(testFile);
+  void putTestFileInTestDir() {
+    testFilePath = '$testPackageTestPath/test.dart';
   }
 
   Future<void> resolveTestCode(String code) async {

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

@@ -75,18 +75,13 @@ class StatementCompletionTest extends AbstractSingleUnitTest {
     bool atEnd = false,
     int delta = 0,
   }) async {
-    testCode = sourceCode.replaceAll('////', '');
+    verifyNoTestUnitErrors = false;
+    await resolveTestCode(sourceCode.replaceAll('////', ''));
     var offset = findOffset(search);
     if (atEnd) {
       delta = search.length;
     }
-    await _prepareCompletionAt(offset + delta, testCode);
-  }
-
-  Future<void> _prepareCompletionAt(int offset, String sourceCode) async {
-    verifyNoTestUnitErrors = false;
-    await resolveTestCode(sourceCode);
-    await _computeCompletion(offset);
+    await _computeCompletion(offset + delta);
   }
 }
 

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

@@ -945,18 +945,14 @@ class NonLibraryAnnotation {
   }
 
   Future<void> _computeUnitAndErrors(String code) async {
-    addTestSource(code);
     verifyNoTestUnitErrors = false;
-    var result = await getResolvedUnit(testFile);
-    testUnit = result.unit;
-    testErrors = result.errors;
+    await resolveTestCode(code);
+    testErrors = testAnalysisResult.errors;
   }
 
   Future<void> _parseUnitAndErrors(String code) async {
-    addTestSource(code);
     verifyNoTestUnitErrors = false;
-    var result = await getParsedUnit(testFile);
-    testUnit = result.unit;
-    testErrors = result.errors;
+    await parseTestCode(code);
+    testErrors = testParsedResult.errors;
   }
 }

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

@@ -104,24 +104,22 @@ void f() {
   }
 
   Future<void> test_createChange_inOtherFile() async {
-    var a = convertPath('$testPackageLibPath/a.dart');
     var b = convertPath('$testPackageLibPath/b.dart');
 
-    newFile(a, r'''
+    addTestSource(r'''
 class A {
   A({test});
 }
 ''');
     newFile(b, r'''
-import 'a.dart';
+import 'test.dart';
 
 void f() {
   new A(test: 2);
 }
 ''');
     await analyzeTestPackageFiles();
 
-    testFilePath = a;
     await resolveTestFile();
 
     createRenameRefactoringAtString('test});');
@@ -134,7 +132,7 @@ class A {
 }
 ''');
     assertFileChangeResult(b, '''
-import 'a.dart';
+import 'test.dart';
 
 void f() {
   new A(newName: 2);

pkg/analysis_server/test/src/services/correction/fix/import_library_project_test.dart

@@ -1293,63 +1293,31 @@ void f(Test t) {}
   }
 
   Future<void> test_withClass_pub_other_inTest_dependencies() async {
-    var aaaRoot = getFolder('$packagesRootPath/aaa');
-    newFile('${aaaRoot.path}/lib/a.dart', '''
-class Test {}
-''');
-
-    updateTestPubspecFile(r'''
-name: test
-dependencies:
-  aaa: any
-''');
-
-    writeTestPackageConfig(
-      config:
-          PackageConfigFileBuilder()..add(name: 'aaa', rootPath: aaaRoot.path),
-    );
-
-    var b = newFile('$testPackageTestPath/b.dart', r'''
+    _createPackageAaa();
+    putTestFileInTestDir();
+    await resolveTestCode(r'''
 void f(Test t) {}
 ''');
 
-    await getResolvedUnit(b);
-
     await assertHasFix('''
 import 'package:aaa/a.dart';
 
 void f(Test t) {}
-''', target: b.path);
+''');
   }
 
   Future<void> test_withClass_pub_other_inTest_devDependencies() async {
-    var aaaRoot = getFolder('$packagesRootPath/aaa');
-    newFile('${aaaRoot.path}/lib/a.dart', '''
-class Test {}
-''');
-
-    updateTestPubspecFile(r'''
-name: test
-dev_dependencies:
-  aaa: any
-''');
-
-    writeTestPackageConfig(
-      config:
-          PackageConfigFileBuilder()..add(name: 'aaa', rootPath: aaaRoot.path),
-    );
-
-    var b = newFile('$testPackageTestPath/b.dart', r'''
+    _createPackageAaa();
+    putTestFileInTestDir();
+    await resolveTestCode(r'''
 void f(Test t) {}
 ''');
 
-    await getResolvedUnit(b);
-
     await assertHasFix('''
 import 'package:aaa/a.dart';
 
 void f(Test t) {}
-''', target: b.path);
+''');
   }
 
   Future<void> test_withClass_pub_this() async {
@@ -1396,17 +1364,16 @@ name: test
 class Test {}
 ''');
 
-    var b = newFile('$testPackageTestPath/b.dart', r'''
+    putTestFileInTestDir();
+    await resolveTestCode(r'''
 void f(Test t) {}
 ''');
 
-    await getResolvedUnit(b);
-
     await assertHasFix('''
 import 'a.dart';
 
 void f(Test t) {}
-''', target: b.path);
+''');
   }
 
   Future<void> test_withClass_simpleIdentifier_lowerCase() async {
@@ -1777,6 +1744,24 @@ void f() {
 }
 ''');
   }
+
+  void _createPackageAaa() {
+    var aaaRoot = getFolder('$packagesRootPath/aaa');
+    newFile('${aaaRoot.path}/lib/a.dart', '''
+class Test {}
+''');
+
+    updateTestPubspecFile(r'''
+name: test
+dependencies:
+  aaa: any
+''');
+
+    writeTestPackageConfig(
+      config:
+          PackageConfigFileBuilder()..add(name: 'aaa', rootPath: aaaRoot.path),
+    );
+  }
 }
 
 @reflectiveTest
@@ -2489,17 +2474,16 @@ name: test
 class Test {}
 ''');
 
-    var b = newFile('$testPackageTestPath/b.dart', r'''
+    putTestFileInTestDir();
+    await resolveTestCode(r'''
 void f(lib.Test t) {}
 ''');
 
-    await getResolvedUnit(b);
-
     await assertHasFix('''
 import 'package:test/src/a.dart' as lib;
 
 void f(lib.Test t) {}
-''', target: b.path);
+''');
   }
 }
 
@@ -2557,17 +2541,16 @@ name: test
 class Test {}
 ''');
 
-    var b = newFile('$testPackageTestPath/b.dart', r'''
+    putTestFileInTestDir();
+    await resolveTestCode(r'''
 void f(lib.Test t) {}
 ''');
 
-    await getResolvedUnit(b);
-
     await assertHasFix('''
 import 'package:test/src/a.dart' as lib show Test;
 
 void f(lib.Test t) {}
-''', target: b.path);
+''');
   }
 }
 
@@ -2642,17 +2625,16 @@ name: test
 class Test {}
 ''');
 
-    var b = newFile('$testPackageTestPath/b.dart', r'''
+    putTestFileInTestDir();
+    await resolveTestCode(r'''
 void f(Test t) {}
 ''');
 
-    await getResolvedUnit(b);
-
     await assertHasFix('''
 import 'package:test/src/a.dart';
 
 void f(Test t) {}
-''', target: b.path);
+''');
   }
 }
 
@@ -2710,16 +2692,15 @@ name: test
 class Test {}
 ''');
 
-    var b = newFile('$testPackageTestPath/b.dart', r'''
+    putTestFileInTestDir();
+    await resolveTestCode(r'''
 void f(Test t) {}
 ''');
 
-    await getResolvedUnit(b);
-
     await assertHasFix('''
 import 'package:test/src/a.dart' show Test;
 
 void f(Test t) {}
-''', target: b.path);
+''');
   }
 }