analyzer etc: move pubspecYamlContent function to be shared

This function was defined once in analyzer testing code, once in
linter testing code. In this change, all three are combined into one
function in analyzer_utilities.

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

Author: srawlins

pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart

@@ -286,10 +286,7 @@ import 'package:aaa/a.dart';
 
     // Add dependency on `package:aaa`.
     writeTestPackagePubspecYamlFile(
-      pubspecYamlContent(
-        name: 'my_test',
-        dependencies: [PubspecYamlFileDependency(name: 'aaa')],
-      ),
+      pubspecYamlContent(name: 'my_test', dependencies: ['aaa']),
     );
 
     // With dependency on `package:aaa` added, no lint is reported.

pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart

@@ -38,36 +38,6 @@ import 'resolution.dart';
 
 export 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
 
-// TODO(scheglov): This is duplicate with
-// pkg/linter/test/rule_test_support.dart. Keep them as consistent with each
-// other as they are today. Ultimately combine them in a shared analyzer test
-// utilities package.
-String pubspecYamlContent({
-  String? name,
-  String? sdkVersion,
-  List<PubspecYamlFileDependency> dependencies = const [],
-}) {
-  var buffer = StringBuffer();
-
-  if (name != null) {
-    buffer.writeln('name: $name');
-  }
-
-  if (sdkVersion != null) {
-    buffer.writeln('environment:');
-    buffer.writeln("  sdk: '$sdkVersion'");
-  }
-
-  if (dependencies.isNotEmpty) {
-    buffer.writeln('dependencies:');
-    for (var dependency in dependencies) {
-      buffer.writeln('  ${dependency.name}: ${dependency.version}');
-    }
-  }
-
-  return buffer.toString();
-}
-
 class BlazeWorkspaceResolutionTest extends ContextResolutionTest {
   @override
   List<String> get collectionIncludedPaths => [workspaceRootPath];
@@ -451,13 +421,6 @@ class PubPackageResolutionTest extends ContextResolutionTest
   }
 }
 
-class PubspecYamlFileDependency {
-  final String name;
-  final String version;
-
-  PubspecYamlFileDependency({required this.name, this.version = 'any'});
-}
-
 mixin WithLanguage219Mixin on PubPackageResolutionTest {
   @override
   String? get testPackageLanguageVersion => '2.19';

pkg/analyzer/test/src/diagnostics/sdk_constraint_verifier_support.dart

@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:analyzer_utilities/testing/test_support.dart';
+
 import '../../generated/test_support.dart';
 import '../dart/resolution/context_collection_resolution.dart';
 

pkg/analyzer_utilities/lib/testing/test_support.dart

@@ -55,3 +55,31 @@ String analysisOptionsContent({
 
   return buffer.toString();
 }
+
+/// Returns the content for a pubspec file, specified appropriately
+/// with the given parameter values.
+String pubspecYamlContent({
+  String? name,
+  String? sdkVersion,
+  List<String> dependencies = const [],
+}) {
+  var buffer = StringBuffer();
+
+  if (name != null) {
+    buffer.writeln('name: $name');
+  }
+
+  if (sdkVersion != null) {
+    buffer.writeln('environment:');
+    buffer.writeln("  sdk: '$sdkVersion'");
+  }
+
+  if (dependencies.isNotEmpty) {
+    buffer.writeln('dependencies:');
+    for (var dependency in dependencies) {
+      buffer.writeln('  $dependency: any');
+    }
+  }
+
+  return buffer.toString();
+}

pkg/linter/test/rule_test_support.dart

@@ -41,20 +41,6 @@ ExpectedDiagnostic error(
   Pattern? messageContains,
 }) => _ExpectedError(code, offset, length, messageContains: messageContains);
 
-// TODO(srawlins): This is duplicate with
-// pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart.
-// Keep them as consistent with each other as they are today. Ultimately combine
-// them in a shared analyzer test utilities package.
-String pubspecYamlContent({String? name}) {
-  var buffer = StringBuffer();
-
-  if (name != null) {
-    buffer.writeln('name: $name');
-  }
-
-  return buffer.toString();
-}
-
 typedef DiagnosticMatcher = bool Function(AnalysisError error);
 
 /// A description of a diagnostic that is expected to be reported.