analyzer_testing: deprecate 'package:js'-related APIs.

This includes MockPackagesMixin.addJs and
PubPackageResolutionTest.addJsPackageDep.

package:js is discontinued. We don't need to keep mocking it.

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

Author: srawlins

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

@@ -367,7 +367,6 @@ class PubPackageResolutionTest extends ContextResolutionTest
     bool angularMeta = false,
     bool ffi = false,
     bool flutter = false,
-    bool js = false,
     bool meta = false,
   }) {
     config = config.copy();
@@ -396,11 +395,6 @@ class PubPackageResolutionTest extends ContextResolutionTest
       config.add(name: 'flutter', rootPath: flutterPath);
     }
 
-    if (js) {
-      var jsPath = addJs().parent.path;
-      config.add(name: 'js', rootPath: jsPath);
-    }
-
     if (meta || flutter) {
       var metaPath = addMeta().parent.path;
       config.add(name: 'meta', rootPath: metaPath);

pkg/analyzer_testing/CHANGELOG.md

@@ -4,6 +4,9 @@
   analysis options file used in testing specifies a `true` value for
   `propagate-linter-exceptions`. This ensures that when tests are run,
   exceptions that occur while processing lint rules will cause the test to fail.
+- Deprecate `MockPackagesMixin.addJs` and
+  `PubPackageResolutionTest.addJsPackageDep`. A mock js package can still be
+  written with `PubPackageResolutionTest.newPackage`.
 - Deprecate `PubPackageResolutionTest.addKernelPackageDep`. A mock kernel
   package can still be written with `PubPackageResolutionTest.newPackage`.
 

pkg/analyzer_testing/api.txt

@@ -29,7 +29,7 @@ package:analyzer_testing/mock_packages/mock_packages.dart:
     addFixnum (method: Folder Function())
     addFlutter (method: Folder Function())
     addFlutterTest (method: Folder Function())
-    addJs (method: Folder Function())
+    addJs (method: Folder Function(), deprecated)
     addKernel (method: Folder Function())
     addMeta (method: Folder Function())
     addPedantic (method: Folder Function())

pkg/analyzer_testing/lib/mock_packages/mock_packages.dart

@@ -112,6 +112,10 @@ mixin MockPackagesMixin {
     return packageFolder.getChildAssumingFolder('lib');
   }
 
+  @Deprecated(
+    'The mock js package is deprecated; use '
+    '`PubPackageResolutionTest.newPackage` to make a custom mock',
+  )
   Folder addJs() {
     var packageFolder = _addFiles('js');
     return packageFolder.getChildAssumingFolder('lib');

pkg/analyzer_testing/lib/src/analysis_rule/pub_package_resolution.dart

@@ -230,6 +230,10 @@ class PubPackageResolutionTest with MockPackagesMixin, ResourceProviderMixin {
   /// Adds the 'js' package as a dependency to the package-under-test.
   ///
   /// This allows various `package:js/` imports to resolve.
+  @Deprecated(
+    'The mock js package is deprecated; use '
+    '`PubPackageResolutionTest.newPackage` to make a custom mock',
+  )
   bool get addJsPackageDep => false;
 
   /// Adds the 'kernel' package as a dependency to the package-under-test.

pkg/linter/test/rules/avoid_relative_lib_imports_test.dart

@@ -15,15 +15,20 @@ void main() {
 @reflectiveTest
 class AvoidRelativeLibImportsTest extends LintRuleTest {
   @override
-  bool get addJsPackageDep => true;
+  String get lintRule => LintNames.avoid_relative_lib_imports;
 
   @override
-  String get lintRule => LintNames.avoid_relative_lib_imports;
+  void setUp() {
+    newPackage('foo').addFile('lib/foo.dart', r'''
+class Foo {}
+''');
+    super.setUp();
+  }
 
   test_externalPackage() async {
     await assertNoDiagnostics(r'''
-/// This provides [JS].
-import 'package:js/js.dart';
+/// This provides [Foo].
+import 'package:foo/foo.dart';
 ''');
   }
 

pkg/linter/test/rules/directives_ordering_test.dart

@@ -73,15 +73,18 @@ class DirectivesOrderingTest extends LintRuleTest {
   @override
   bool get addFlutterPackageDep => true;
 
-  @override
-  bool get addJsPackageDep => true;
-
   @override
   bool get addMetaPackageDep => true;
 
   @override
   String get lintRule => LintNames.directives_ordering;
 
+  @override
+  void setUp() {
+    newPackage('foo').addFile('lib/foo.dart', '');
+    super.setUp();
+  }
+
   test_dartDirectivesGoFirst_docImports() async {
     newFile('$testPackageLibPath/a.dart', '');
     await assertDiagnostics(
@@ -193,13 +196,13 @@ main() {}
     await assertDiagnostics(
       r'''
 /// @docImport 'dart:math';
-/// @docImport 'package:js/js.dart';
+/// @docImport 'package:foo/foo.dart';
 /// @docImport 'a.dart';
 /// @docImport 'package:meta/meta.dart';
 /// @docImport 'b.dart';
 library;
 ''',
-      [lint(98, 32)],
+      [lint(100, 32)],
     );
   }
 
@@ -210,12 +213,12 @@ library;
       r'''
 export 'dart:math';
 export 'a.dart';
-export 'package:js/js.dart';
+export 'package:foo/foo.dart';
 export 'package:meta/meta.dart';
 export 'b.dart';
 // ignore_for_file: unused_import
 ''',
-      [lint(37, 28), lint(66, 32)],
+      [lint(37, 30), lint(68, 32)],
     );
   }
 
@@ -225,13 +228,13 @@ export 'b.dart';
     await assertDiagnostics(
       r'''
 import 'dart:math';
-import 'package:js/js.dart';
+import 'package:foo/foo.dart';
 import 'a.dart';
 import 'package:meta/meta.dart';
 import 'b.dart';
 // ignore_for_file: unused_import
 ''',
-      [lint(66, 32)],
+      [lint(68, 32)],
     );
   }
 
@@ -291,10 +294,10 @@ part 'a.dart';
       r'''
 import 'package:meta/meta.dart';
 import 'a.dart';
-import 'package:js/js.dart';
+import 'package:foo/foo.dart';
 // ignore_for_file: unused_import
 ''',
-      [lint(50, 28)],
+      [lint(50, 30)],
     );
   }
 
@@ -365,15 +368,15 @@ import 'foo1.dart';
     newFile('$testPackageLibPath/c.dart', '');
     await assertDiagnostics(
       r'''
-export 'package:js/js.dart';
+export 'package:foo/foo.dart';
 export 'package:meta/meta.dart';
 export 'package:flutter/widgets.dart';
 
 export 'package:test/a.dart';
 export 'package:test/c.dart';
 export 'package:test/b.dart';
 ''',
-      [lint(62, 38), lint(162, 29)],
+      [lint(64, 38), lint(164, 29)],
     );
   }
 
@@ -383,7 +386,7 @@ export 'package:test/b.dart';
     newFile('$testPackageLibPath/c.dart', '');
     await assertDiagnostics(
       r'''
-import 'package:js/js.dart';
+import 'package:foo/foo.dart';
 import 'package:meta/meta.dart';
 import 'package:flutter/widgets.dart';
 
@@ -392,7 +395,7 @@ import 'package:test/c.dart';
 import 'package:test/b.dart';
 // ignore_for_file: unused_import
 ''',
-      [lint(62, 38), lint(162, 29)],
+      [lint(64, 38), lint(164, 29)],
     );
   }
 

pkg/linter/test/rules/invalid_runtime_check_with_js_interop_types_test.dart

@@ -16,10 +16,18 @@ void main() {
 @reflectiveTest
 class InvalidRuntimeCheckWithJSInteropTypesTest extends LintRuleTest {
   @override
-  bool get addJsPackageDep => true;
+  String get lintRule => LintNames.invalid_runtime_check_with_js_interop_types;
 
   @override
-  String get lintRule => LintNames.invalid_runtime_check_with_js_interop_types;
+  void setUp() {
+    newPackage('js').addFile('lib/js.dart', r'''
+library js;
+
+// ignore: EXPORT_INTERNAL_LIBRARY
+export 'dart:_js_annotations' show JS, staticInterop;
+''');
+    super.setUp();
+  }
 
   test_baseTypesAs_dart_type_as_js_type() async {
     await _testCasts([_AsCast('int', 'JSNumber')]);

pkg/linter/test/rules/prefer_relative_imports_test.dart

@@ -16,15 +16,20 @@ void main() {
 @reflectiveTest
 class PreferRelativeImportsTest extends LintRuleTest {
   @override
-  bool get addJsPackageDep => true;
+  String get lintRule => LintNames.prefer_relative_imports;
 
   @override
-  String get lintRule => LintNames.prefer_relative_imports;
+  void setUp() {
+    newPackage('foo').addFile('lib/foo.dart', r'''
+class Foo {}
+''');
+    super.setUp();
+  }
 
   test_externalPackage() async {
     await assertNoDiagnostics(r'''
-/// This provides [JS].
-import 'package:js/js.dart';
+/// This provides [Foo].
+import 'package:foo/foo.dart';
 ''');
   }