diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart index bae688b242f..ffe2fece672 100644 --- a/pkg/analysis_server/test/abstract_context.dart +++ b/pkg/analysis_server/test/abstract_context.dart @@ -19,8 +19,8 @@ import 'package:analyzer/src/test_utilities/platform.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/utilities/extensions/file_system.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/test/experiments/experiments.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; import 'package:linter/src/rules.dart'; import 'package:meta/meta.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/analysis_server_base.dart b/pkg/analysis_server/test/analysis_server_base.dart index c25d4d8e583..a3f1b78a620 100644 --- a/pkg/analysis_server/test/analysis_server_base.dart +++ b/pkg/analysis_server/test/analysis_server_base.dart @@ -19,8 +19,8 @@ import 'package:analyzer/src/test_utilities/mock_sdk.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer/src/test_utilities/test_code_format.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/test/experiments/experiments.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:meta/meta.dart'; import 'package:test/test.dart'; diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/test/integration/support/integration_tests.dart index a9d1311299f..b0fb602e048 100644 --- a/pkg/analysis_server/test/integration/support/integration_tests.dart +++ b/pkg/analysis_server/test/integration/support/integration_tests.dart @@ -13,7 +13,7 @@ import 'package:analysis_server/src/services/pub/pub_command.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer_plugin/protocol/protocol_common.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:meta/meta.dart'; import 'package:path/path.dart' as path; diff --git a/pkg/analysis_server/test/lsp/server_abstract.dart b/pkg/analysis_server/test/lsp/server_abstract.dart index d4f13666893..274bc136211 100644 --- a/pkg/analysis_server/test/lsp/server_abstract.dart +++ b/pkg/analysis_server/test/lsp/server_abstract.dart @@ -23,8 +23,8 @@ import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer_plugin/protocol/protocol.dart' as plugin; import 'package:analyzer_plugin/src/protocol/protocol_internal.dart' as plugin; import 'package:analyzer_plugin/src/utilities/client_uri_converter.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/test/experiments/experiments.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; import 'package:collection/collection.dart'; import 'package:language_server_protocol/json_parsing.dart'; import 'package:meta/meta.dart'; diff --git a/pkg/analysis_server/test/src/cider/assists_test.dart b/pkg/analysis_server/test/src/cider/assists_test.dart index 8e4287fb535..7826bf9f83c 100644 --- a/pkg/analysis_server/test/src/cider/assists_test.dart +++ b/pkg/analysis_server/test/src/cider/assists_test.dart @@ -10,7 +10,7 @@ import 'package:analyzer/source/line_info.dart'; import 'package:analyzer/src/test_utilities/test_code_format.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' show SourceEdit; import 'package:analyzer_plugin/utilities/assist/assist.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/cider/document_symbols_test.dart b/pkg/analysis_server/test/src/cider/document_symbols_test.dart index 43a2599716a..08225791d2d 100644 --- a/pkg/analysis_server/test/src/cider/document_symbols_test.dart +++ b/pkg/analysis_server/test/src/cider/document_symbols_test.dart @@ -4,7 +4,7 @@ import 'package:analysis_server/lsp_protocol/protocol.dart'; import 'package:analysis_server/src/cider/document_symbols.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:test/expect.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/src/cider/rename_test.dart b/pkg/analysis_server/test/src/cider/rename_test.dart index 7e3c7d957f0..d31cb5269cb 100644 --- a/pkg/analysis_server/test/src/cider/rename_test.dart +++ b/pkg/analysis_server/test/src/cider/rename_test.dart @@ -6,7 +6,7 @@ import 'package:analysis_server/src/cider/rename.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer/src/test_utilities/test_code_format.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; diff --git a/pkg/analysis_server/test/support/configuration_files.dart b/pkg/analysis_server/test/support/configuration_files.dart index b2ae8f6623b..d844501717d 100644 --- a/pkg/analysis_server/test/support/configuration_files.dart +++ b/pkg/analysis_server/test/support/configuration_files.dart @@ -8,8 +8,8 @@ import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_testing/package_root.dart' as package_root; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; /// A mixin adding functionality to write `.dart_tool/package_config.json` /// files along with mock packages to a [ResourceProvider]. diff --git a/pkg/analysis_server/test/verify_sorted_test.dart b/pkg/analysis_server/test/verify_sorted_test.dart index 4b949252590..1172310863e 100644 --- a/pkg/analysis_server/test/verify_sorted_test.dart +++ b/pkg/analysis_server/test/verify_sorted_test.dart @@ -76,7 +76,6 @@ void buildTests({ void buildTestsForAnalysisServer() { var excludedPaths = [ - 'test/mock_packages', // TODO(brianwilkerson): Fix the generator to sort the generated files and // remove these exclusions. 'lib/protocol/protocol_constants.dart', diff --git a/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart b/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart index 769cfd74cf0..d9f000155d7 100644 --- a/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart +++ b/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart @@ -23,8 +23,8 @@ import 'package:analyzer/src/workspace/basic.dart'; import 'package:analyzer/src/workspace/blaze.dart'; import 'package:analyzer/src/workspace/gn.dart'; import 'package:analyzer/src/workspace/pub.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/test/experiments/experiments.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:analyzer_utilities/testing/tree_string_sink.dart'; import 'package:linter/src/rules.dart'; diff --git a/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart b/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart index 55ece982d51..30dfce9f7e8 100644 --- a/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart +++ b/pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart @@ -3,7 +3,7 @@ // BSD-style license that can be found in the LICENSE file. import 'package:analyzer/src/error/codes.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; import '../dart/resolution/context_collection_resolution.dart'; diff --git a/pkg/analyzer_plugin/test/support/abstract_context.dart b/pkg/analyzer_plugin/test/support/abstract_context.dart index f3afc2a8ab7..e3d8c46382f 100644 --- a/pkg/analyzer_plugin/test/support/abstract_context.dart +++ b/pkg/analyzer_plugin/test/support/abstract_context.dart @@ -13,8 +13,8 @@ import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/test/experiments/experiments.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; import 'package:linter/src/rules.dart'; import 'package:meta/meta.dart'; diff --git a/pkg/analyzer_testing/analysis_options.yaml b/pkg/analyzer_testing/analysis_options.yaml new file mode 100644 index 00000000000..4b4a45e0ede --- /dev/null +++ b/pkg/analyzer_testing/analysis_options.yaml @@ -0,0 +1,23 @@ +include: package:lints/recommended.yaml + +analyzer: + exclude: + - lib/mock_packages/package_content/** + language: + strict-casts: true + strict-inference: true + strict-raw-types: true + +linter: + rules: + - avoid_dynamic_calls + - avoid_unused_constructor_parameters + - flutter_style_todos + - library_annotations + - prefer_single_quotes + - unawaited_futures + - unnecessary_breaks + - unnecessary_ignore + - unnecessary_library_directive + - unnecessary_parenthesis + - unreachable_from_main diff --git a/pkg/analyzer_testing/api.txt b/pkg/analyzer_testing/api.txt index 3f5445ec3f6..f0f53c678f1 100644 --- a/pkg/analyzer_testing/api.txt +++ b/pkg/analyzer_testing/api.txt @@ -1,4 +1,31 @@ +package:analyzer_testing/mock_packages/mock_packages.dart: + BlazeMockPackages (class extends Object): + instance (static getter: BlazeMockPackages) + addFlutter (method: void Function(ResourceProvider)) + addMeta (method: void Function(ResourceProvider)) + MockPackagesMixin (mixin on Object): + packagesRootPath (getter: String) + pathContext (getter: Context) + resourceProvider (getter: ResourceProvider) + addAngularMeta (method: Folder Function()) + addFfi (method: Folder Function()) + addFixnum (method: Folder Function()) + addFlutter (method: Folder Function()) + addFlutterTest (method: Folder Function()) + addJs (method: Folder Function()) + addKernel (method: Folder Function()) + addMeta (method: Folder Function()) + addPedantic (method: Folder Function()) + addTestReflectiveLoader (method: Folder Function()) + addUI (method: Folder Function()) + addVectorMath (method: Folder Function()) package:analyzer_testing/package_root.dart: packageRoot (static getter: String) dart:core: + Object (referenced) String (referenced) +package:analyzer/file_system/file_system.dart: + Folder (referenced) + ResourceProvider (referenced) +package:path/src/context.dart: + Context (referenced) diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart b/pkg/analyzer_testing/lib/mock_packages/mock_packages.dart similarity index 99% rename from pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart rename to pkg/analyzer_testing/lib/mock_packages/mock_packages.dart index 2c01812b24a..436f5a64064 100644 --- a/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart +++ b/pkg/analyzer_testing/lib/mock_packages/mock_packages.dart @@ -15,9 +15,8 @@ void _cacheFiles(Map cachedFiles) { var packageRoot = pathContext.normalize(package_root.packageRoot); var mockPath = pathContext.join( packageRoot, - 'analyzer_utilities', + 'analyzer_testing', 'lib', - 'test', 'mock_packages', 'package_content', ); diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/angular_meta/lib/angular_meta.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/angular_meta/lib/angular_meta.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/angular_meta/lib/angular_meta.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/angular_meta/lib/angular_meta.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/angular_meta/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/angular_meta/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/angular_meta/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/angular_meta/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ffi/lib/ffi.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/ffi/lib/ffi.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/ffi/lib/ffi.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/ffi/lib/ffi.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ffi/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/ffi/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/ffi/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/ffi/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/fixnum/lib/fixnum.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/fixnum/lib/fixnum.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/fixnum/lib/fixnum.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/fixnum/lib/fixnum.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/fixnum/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/fixnum/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/fixnum/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/fixnum/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/animation.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/animation.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/animation.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/animation.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/cupertino.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/cupertino.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/cupertino.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/cupertino.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/foundation.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/foundation.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/foundation.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/foundation.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/material.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/material.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/material.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/material.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/painting.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/painting.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/painting.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/painting.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/rendering.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/rendering.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/rendering.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/rendering.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/animation/animation_controller.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/animation/animation_controller.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/animation/animation_controller.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/animation/animation_controller.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/cupertino/colors.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/cupertino/colors.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/cupertino/colors.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/cupertino/colors.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/assertions.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/assertions.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/assertions.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/assertions.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/constants.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/constants.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/constants.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/constants.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/diagnostics.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/diagnostics.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/diagnostics.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/diagnostics.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/key.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/key.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/key.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/key.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/print.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/print.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/print.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/foundation/print.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/app_bar.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/app_bar.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/app_bar.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/app_bar.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/colors.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/colors.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/colors.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/colors.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/icons.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/icons.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/icons.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/icons.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/ink_well.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/ink_well.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/ink_well.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/ink_well.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/scaffold.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/scaffold.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/scaffold.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/material/scaffold.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/alignment.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/alignment.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/alignment.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/alignment.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/basic_types.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/basic_types.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/basic_types.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/basic_types.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/border_radius.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/border_radius.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/border_radius.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/border_radius.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/borders.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/borders.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/borders.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/borders.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_border.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/box_border.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_border.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/box_border.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_decoration.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/box_decoration.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_decoration.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/box_decoration.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/colors.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/colors.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/colors.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/colors.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/decoration.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/decoration.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/decoration.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/decoration.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/edge_insets.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/edge_insets.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/edge_insets.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/edge_insets.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_painter.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/text_painter.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_painter.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/text_painter.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_style.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/text_style.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_style.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/painting/text_style.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/flex.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/rendering/flex.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/flex.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/rendering/flex.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/paragraph.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/rendering/paragraph.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/paragraph.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/rendering/paragraph.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widget_previews/widget_previews.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widget_previews/widget_previews.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widget_previews/widget_previews.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widget_previews/widget_previews.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/async.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/async.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/async.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/async.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/basic.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/basic.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/basic.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/basic.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/container.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/container.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/container.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/container.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/framework.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/framework.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/framework.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/framework.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/gesture_detector.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/gesture_detector.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/gesture_detector.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/gesture_detector.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/icon.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/icon.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/icon.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/icon.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/navigator.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/navigator.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/navigator.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/navigator.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/placeholder.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/placeholder.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/placeholder.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/placeholder.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/text.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/text.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/text.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/text.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/ticker_provider.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/ticker_provider.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/ticker_provider.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/ticker_provider.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/value_listenable_builder.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/value_listenable_builder.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/value_listenable_builder.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/value_listenable_builder.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/widget_inspector.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/widget_inspector.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/widget_inspector.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/src/widgets/widget_inspector.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/widget_previews.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/widget_previews.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/widget_previews.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/widget_previews.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/widgets.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/widgets.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/widgets.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/lib/widgets.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter_test/lib/flutter_test.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter_test/lib/flutter_test.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter_test/lib/flutter_test.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter_test/lib/flutter_test.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter_test/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/flutter_test/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter_test/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/flutter_test/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/js/lib/js.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/js/lib/js.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/js/lib/js.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/js/lib/js.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/js/lib/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/js/lib/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/js/lib/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/js/lib/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/kernel/lib/ast.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/kernel/lib/ast.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/kernel/lib/ast.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/kernel/lib/ast.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/kernel/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/kernel/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/kernel/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/kernel/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/meta/lib/meta.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/meta/lib/meta.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/meta/lib/meta_meta.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/meta/lib/meta_meta.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/meta/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/meta/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/pedantic/lib/analysis_options.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/pedantic/lib/analysis_options.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/pedantic/lib/analysis_options.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/pedantic/lib/analysis_options.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/test_reflective_loader/lib/test_reflective_loader.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/test_reflective_loader/lib/test_reflective_loader.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/test_reflective_loader/lib/test_reflective_loader.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/test_reflective_loader/lib/test_reflective_loader.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/test_reflective_loader/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/test_reflective_loader/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/test_reflective_loader/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/test_reflective_loader/pubspec.yaml diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/geometry.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/geometry.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/geometry.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/geometry.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/painting.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/painting.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/painting.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/painting.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/text.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/text.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/text.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/text.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/ui.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/ui.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/ui.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/ui/lib/ui.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/matrix4.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/vector_math/lib/matrix4.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/matrix4.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/vector_math/lib/matrix4.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/vector_math_64.dart b/pkg/analyzer_testing/lib/mock_packages/package_content/vector_math/lib/vector_math_64.dart similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/vector_math_64.dart rename to pkg/analyzer_testing/lib/mock_packages/package_content/vector_math/lib/vector_math_64.dart diff --git a/pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/pubspec.yaml b/pkg/analyzer_testing/lib/mock_packages/package_content/vector_math/pubspec.yaml similarity index 100% rename from pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/pubspec.yaml rename to pkg/analyzer_testing/lib/mock_packages/package_content/vector_math/pubspec.yaml diff --git a/pkg/analyzer_testing/pubspec.yaml b/pkg/analyzer_testing/pubspec.yaml index fac1f0a8d07..77a3e70bfb7 100644 --- a/pkg/analyzer_testing/pubspec.yaml +++ b/pkg/analyzer_testing/pubspec.yaml @@ -6,6 +6,7 @@ environment: resolution: workspace dependencies: + analyzer: ^8.0.0-dev path: ^1.9.0 # We use 'any' version constraints here as we get our package versions from diff --git a/pkg/analyzer_utilities/analysis_options.yaml b/pkg/analyzer_utilities/analysis_options.yaml index 261c001dfd8..5b8721d0cf1 100644 --- a/pkg/analyzer_utilities/analysis_options.yaml +++ b/pkg/analyzer_utilities/analysis_options.yaml @@ -1,8 +1,6 @@ include: package:lints/recommended.yaml analyzer: - exclude: - - lib/test/mock_packages/package_content/** language: strict-casts: true strict-inference: true diff --git a/pkg/analyzer_utilities/pubspec.yaml b/pkg/analyzer_utilities/pubspec.yaml index b20868acdd1..35dde48fdcc 100644 --- a/pkg/analyzer_utilities/pubspec.yaml +++ b/pkg/analyzer_utilities/pubspec.yaml @@ -9,7 +9,6 @@ resolution: workspace # Use 'any' constraints here; we get our versions from the DEPS file. dependencies: - analyzer_testing: any analyzer: any collection: any dart_style: any diff --git a/pkg/linter/pubspec.yaml b/pkg/linter/pubspec.yaml index 37560cff8a5..058a2f1bcaa 100644 --- a/pkg/linter/pubspec.yaml +++ b/pkg/linter/pubspec.yaml @@ -23,6 +23,7 @@ dependencies: # Use 'any' constraints here; we get our versions from the DEPS file. dev_dependencies: + analyzer_testing: any analyzer_utilities: any args: any cli_util: any diff --git a/pkg/linter/test/rule_test_support.dart b/pkg/linter/test/rule_test_support.dart index 917f3cb3480..6b4da5afb9e 100644 --- a/pkg/linter/test/rule_test_support.dart +++ b/pkg/linter/test/rule_test_support.dart @@ -21,8 +21,8 @@ import 'package:analyzer/src/lint/util.dart'; import 'package:analyzer/src/test_utilities/mock_sdk.dart'; import 'package:analyzer/src/test_utilities/package_config_file_builder.dart'; import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; +import 'package:analyzer_testing/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/test/experiments/experiments.dart'; -import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; import 'package:analyzer_utilities/testing/test_support.dart'; import 'package:collection/collection.dart'; import 'package:linter/src/analyzer.dart'; diff --git a/tools/package_deps/bin/package_deps.dart b/tools/package_deps/bin/package_deps.dart index c28bde54e17..f3876492209 100644 --- a/tools/package_deps/bin/package_deps.dart +++ b/tools/package_deps/bin/package_deps.dart @@ -335,7 +335,7 @@ class Package implements Comparable { final uriPath = entity.uri.path; const excludedPaths = { 'pkg/analyzer_cli/test/data/', - 'pkg/analyzer_utilities/lib/test/mock_packages/package_content/', + 'pkg/analyzer_testing/lib/mock_packages/package_content/', 'pkg/front_end/test/id_testing/data/', 'pkg/front_end/test/enable_non_nullable/data/', 'pkg/front_end/test/language_versioning/data/',