analyzer_testing: deprecate MockPackagesMixin.addPedantic

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

Author: srawlins

pkg/analysis_server/test/analysis/notification_errors_test.dart

@@ -73,7 +73,7 @@ linter:
 
   Future<void> test_analysisOptionsFile_packageInclude() async {
     var analysisOptions = newAnalysisOptionsYamlFile(testPackageRootPath, '''
-include: package:pedantic/analysis_options.yaml
+include: package:lints/lints.yaml
 ''');
 
     await setRoots(included: [workspaceRootPath], excluded: []);
@@ -89,7 +89,15 @@ include: package:pedantic/analysis_options.yaml
     expect(error.type, AnalysisErrorType.STATIC_WARNING);
 
     // Write a package file that allows resolving the include.
-    writeTestPackageConfig(pedantic: true);
+    var lintsRootPath = '/packages/lints';
+    newFile(
+      '$lintsRootPath/lib/lints.yaml',
+      '# Used for testing diagnostics for imports in analysis options files.',
+    );
+    writeTestPackageConfig(
+      config: PackageConfigFileBuilder()
+        ..add(name: 'lints', rootPath: lintsRootPath),
+    );
 
     // Ensure the errors disappear.
     await waitForTasksFinished();

pkg/analysis_server/test/shared/shared_test_interface.dart

@@ -80,6 +80,5 @@ abstract interface class SharedTestInterface {
     String? languageVersion,
     bool flutter = false,
     bool meta = false,
-    bool pedantic = false,
   });
 }

pkg/analysis_server/test/support/configuration_files.dart

@@ -46,7 +46,6 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
     String? languageVersion,
     bool flutter = false,
     bool meta = false,
-    bool pedantic = false,
   }) {
     projectFolderPath = resourceProvider.convertPath(projectFolderPath);
 
@@ -81,11 +80,6 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
       config.add(name: 'flutter_test', rootPath: libFolder.parent.path);
     }
 
-    if (pedantic) {
-      var libFolder = addPedantic();
-      config.add(name: 'pedantic', rootPath: libFolder.parent.path);
-    }
-
     if (addVectorMathPackageDep) {
       var libFolder = addVectorMath();
       config.add(name: 'vector_math', rootPath: libFolder.parent.path);
@@ -109,7 +103,6 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
     String? languageVersion,
     bool flutter = false,
     bool meta = false,
-    bool pedantic = false,
   }) {
     writePackageConfig(
       testPackageRootPath,
@@ -118,7 +111,6 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
       packageName: 'test',
       flutter: flutter,
       meta: meta,
-      pedantic: pedantic,
     );
   }
 }

pkg/analyzer_testing/CHANGELOG.md

@@ -7,8 +7,11 @@
 - Deprecate `MockPackagesMixin.addJs` and
   `PubPackageResolutionTest.addJsPackageDep`. A mock js package can still be
   written with `PubPackageResolutionTest.newPackage`.
-- Deprecate `PubPackageResolutionTest.addKernelPackageDep`. A mock kernel
+- Deprecate `MockPackagesMixin.addKernel` and
+  `PubPackageResolutionTest.addKernelPackageDep`. A mock kernel
   package can still be written with `PubPackageResolutionTest.newPackage`.
+- Deprecate `MockPackagesMixin.addPedantic`. A mock pedantic package can still
+  be written with `PubPackageResolutionTest.newPackage`.
 
 ## 0.1.7
 

pkg/analyzer_testing/api.txt

@@ -30,9 +30,9 @@ package:analyzer_testing/mock_packages/mock_packages.dart:
     addFlutter (method: Folder Function())
     addFlutterTest (method: Folder Function())
     addJs (method: Folder Function(), deprecated)
-    addKernel (method: Folder Function())
+    addKernel (method: Folder Function(), deprecated)
     addMeta (method: Folder Function())
-    addPedantic (method: Folder Function())
+    addPedantic (method: Folder Function(), deprecated)
     addTestReflectiveLoader (method: Folder Function())
     addUI (method: Folder Function())
     addVectorMath (method: Folder Function())

pkg/analyzer_testing/lib/mock_packages/mock_packages.dart

@@ -121,6 +121,10 @@ mixin MockPackagesMixin {
     return packageFolder.getChildAssumingFolder('lib');
   }
 
+  @Deprecated(
+    'The mock kernel package is deprecated; use '
+    '`PubPackageResolutionTest.newPackage` to make a custom mock',
+  )
   Folder addKernel() {
     var packageFolder = _addFiles('kernel');
     return packageFolder.getChildAssumingFolder('lib');
@@ -131,6 +135,10 @@ mixin MockPackagesMixin {
     return packageFolder.getChildAssumingFolder('lib');
   }
 
+  @Deprecated(
+    'The mock pedantic package is deprecated; use '
+    '`PubPackageResolutionTest.newPackage` to make a custom mock',
+  )
   Folder addPedantic() {
     var packageFolder = _addFiles('pedantic');
     return packageFolder.getChildAssumingFolder('lib');