diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart index 4f250ab8662..a64d32846a5 100644 --- a/pkg/analysis_server/test/abstract_context.dart +++ b/pkg/analysis_server/test/abstract_context.dart @@ -19,11 +19,11 @@ 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_utilities/test/mock_packages/mock_packages.dart'; import 'package:linter/src/rules.dart'; import 'package:meta/meta.dart'; import 'package:test/test.dart'; -import 'src/utilities/mock_packages.dart'; import 'support/configuration_files.dart'; import 'test_macros.dart'; diff --git a/pkg/analysis_server/test/analysis_server_base.dart b/pkg/analysis_server/test/analysis_server_base.dart index ccd09dd0c82..4fa06684c62 100644 --- a/pkg/analysis_server/test/analysis_server_base.dart +++ b/pkg/analysis_server/test/analysis_server_base.dart @@ -18,12 +18,12 @@ import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/test_utilities/mock_sdk.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_utilities/test/mock_packages/mock_packages.dart'; import 'package:meta/meta.dart'; import 'package:test/test.dart'; import 'package:unified_analytics/unified_analytics.dart'; import 'mocks.dart'; -import 'src/utilities/mock_packages.dart'; import 'support/configuration_files.dart'; import 'test_macros.dart'; diff --git a/pkg/analysis_server/test/integration/support/integration_tests.dart b/pkg/analysis_server/test/integration/support/integration_tests.dart index 156e004986e..20ba99238e7 100644 --- a/pkg/analysis_server/test/integration/support/integration_tests.dart +++ b/pkg/analysis_server/test/integration/support/integration_tests.dart @@ -14,12 +14,12 @@ import 'package:analyzer/file_system/file_system.dart' as analyzer_fs; 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:meta/meta.dart'; import 'package:path/path.dart' as path; import 'package:test/test.dart'; import '../../analysis_server_base.dart' show AnalysisOptionsFileConfig; -import '../../src/utilities/mock_packages.dart'; import '../../support/configuration_files.dart'; import '../../test_macros.dart' as macros; import 'integration_test_methods.dart'; diff --git a/pkg/analysis_server/test/lsp/server_abstract.dart b/pkg/analysis_server/test/lsp/server_abstract.dart index b64af1e3978..0a06c8c9fc2 100644 --- a/pkg/analysis_server/test/lsp/server_abstract.dart +++ b/pkg/analysis_server/test/lsp/server_abstract.dart @@ -23,6 +23,7 @@ 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_utilities/test/mock_packages/mock_packages.dart'; import 'package:collection/collection.dart'; import 'package:language_server_protocol/json_parsing.dart'; import 'package:path/path.dart' as path; @@ -31,7 +32,6 @@ import 'package:unified_analytics/unified_analytics.dart'; import '../mocks.dart'; import '../mocks_lsp.dart'; -import '../src/utilities/mock_packages.dart'; import '../support/configuration_files.dart'; import '../test_macros.dart'; import 'change_verifier.dart'; diff --git a/pkg/analysis_server/test/mock_packages/.dart_tool/package_config.json b/pkg/analysis_server/test/mock_packages/.dart_tool/package_config.json deleted file mode 100644 index 19affdb662e..00000000000 --- a/pkg/analysis_server/test/mock_packages/.dart_tool/package_config.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "configVersion": 2, - "packages": [ - { - "name": "flutter", - "rootUri": "../flutter", - "packageUri": "lib/", - "languageVersion": "2.9" - }, - { - "name": "meta", - "rootUri": "../meta", - "packageUri": "lib/", - "languageVersion": "2.9" - }, - { - "name": "pedantic", - "rootUri": "../pedantic", - "packageUri": "lib/", - "languageVersion": "2.9" - }, - { - "name": "ui", - "rootUri": "../ui", - "packageUri": "lib/", - "languageVersion": "2.9" - }, - { - "name": "vector_math", - "rootUri": "../vector_math", - "packageUri": "lib/", - "languageVersion": "2.9" - } - ] -} diff --git a/pkg/analysis_server/test/src/cider/assists_test.dart b/pkg/analysis_server/test/src/cider/assists_test.dart index 6bc2de84d94..b2956c90c87 100644 --- a/pkg/analysis_server/test/src/cider/assists_test.dart +++ b/pkg/analysis_server/test/src/cider/assists_test.dart @@ -10,10 +10,10 @@ import 'package:analysis_server/src/services/correction/fix_processor.dart'; import 'package:analyzer/source/line_info.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:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; -import '../utilities/mock_packages.dart'; import 'cider_service.dart'; void main() { 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 f1ebc405955..3d7534bf2a0 100644 --- a/pkg/analysis_server/test/src/cider/document_symbols_test.dart +++ b/pkg/analysis_server/test/src/cider/document_symbols_test.dart @@ -4,10 +4,10 @@ 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:test/expect.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; -import '../utilities/mock_packages.dart'; import 'cider_service.dart'; void main() { diff --git a/pkg/analysis_server/test/src/cider/rename_test.dart b/pkg/analysis_server/test/src/cider/rename_test.dart index 6d772a85d6e..31469214b22 100644 --- a/pkg/analysis_server/test/src/cider/rename_test.dart +++ b/pkg/analysis_server/test/src/cider/rename_test.dart @@ -5,10 +5,10 @@ import 'package:analysis_server/src/cider/rename.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart'; +import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart'; import 'package:test/test.dart'; import 'package:test_reflective_loader/test_reflective_loader.dart'; -import '../utilities/mock_packages.dart'; import 'cider_service.dart'; void main() { diff --git a/pkg/analysis_server/test/support/configuration_files.dart b/pkg/analysis_server/test/support/configuration_files.dart index 0573eb50a0e..e5060f3b170 100644 --- a/pkg/analysis_server/test/support/configuration_files.dart +++ b/pkg/analysis_server/test/support/configuration_files.dart @@ -9,8 +9,7 @@ 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_utilities/package_root.dart' as package_root; - -import '../src/utilities/mock_packages.dart'; +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/analyzer_utilities/analysis_options.yaml b/pkg/analyzer_utilities/analysis_options.yaml index 86c10cc2aa2..56acbc8ebb7 100644 --- a/pkg/analyzer_utilities/analysis_options.yaml +++ b/pkg/analyzer_utilities/analysis_options.yaml @@ -1,6 +1,8 @@ include: package:lints/recommended.yaml analyzer: + exclude: + - lib/test/mock_packages/package_content/** language: strict-casts: true strict-inference: true diff --git a/pkg/analysis_server/test/src/utilities/mock_packages.dart b/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart similarity index 98% rename from pkg/analysis_server/test/src/utilities/mock_packages.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart index 284d52630cd..2d0613353e6 100644 --- a/pkg/analysis_server/test/src/utilities/mock_packages.dart +++ b/pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart @@ -4,6 +4,7 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; +// ignore: implementation_imports import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart'; import 'package:analyzer_utilities/package_root.dart' as package_root; import 'package:path/path.dart' as path; @@ -14,9 +15,11 @@ void _cacheFiles(Map cachedFiles) { var packageRoot = pathContext.normalize(package_root.packageRoot); var mockPath = pathContext.join( packageRoot, - 'analysis_server', + 'analyzer_utilities', + 'lib', 'test', 'mock_packages', + 'package_content', ); void addFiles(Resource resource) { diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/animation.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/animation.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/animation.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/animation.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/cupertino.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/cupertino.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/cupertino.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/cupertino.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/foundation.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/foundation.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/foundation.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/foundation.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/material.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/material.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/material.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/material.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/painting.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/painting.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/painting.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/painting.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/rendering.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/rendering.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/rendering.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/rendering.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/animation/animation_controller.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/animation/animation_controller.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/animation/animation_controller.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/animation/animation_controller.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/cupertino/colors.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/cupertino/colors.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/cupertino/colors.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/cupertino/colors.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/diagnostics.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/diagnostics.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/diagnostics.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/diagnostics.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/key.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/key.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/key.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/foundation/key.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/material/app_bar.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/app_bar.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/material/app_bar.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/app_bar.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/material/colors.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/colors.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/material/colors.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/colors.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/material/icons.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/icons.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/material/icons.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/icons.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/material/ink_well.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/ink_well.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/material/ink_well.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/ink_well.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/material/scaffold.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/scaffold.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/material/scaffold.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/material/scaffold.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/alignment.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/alignment.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/alignment.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/alignment.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/basic_types.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/basic_types.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/basic_types.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/basic_types.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/border_radius.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/border_radius.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/border_radius.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/border_radius.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/borders.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/borders.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/borders.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/borders.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/box_border.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_border.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/box_border.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_border.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/box_decoration.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_decoration.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/box_decoration.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/box_decoration.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/colors.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/colors.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/colors.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/colors.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/decoration.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/decoration.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/decoration.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/decoration.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/edge_insets.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/edge_insets.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/edge_insets.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/edge_insets.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/text_painter.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_painter.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/text_painter.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_painter.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/text_style.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_style.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/painting/text_style.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/painting/text_style.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/rendering/flex.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/flex.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/rendering/flex.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/flex.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/rendering/paragraph.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/paragraph.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/rendering/paragraph.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/rendering/paragraph.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/async.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/async.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/async.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/async.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/basic.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/basic.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/basic.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/basic.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/container.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/container.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/container.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/container.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/framework.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/framework.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/framework.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/framework.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/gesture_detector.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/gesture_detector.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/gesture_detector.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/gesture_detector.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/icon.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/icon.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/icon.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/icon.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/placeholder.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/placeholder.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/placeholder.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/placeholder.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/text.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/text.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/text.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/text.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/ticker_provider.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/ticker_provider.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/src/widgets/ticker_provider.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/src/widgets/ticker_provider.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/widgets.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/widgets.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/lib/widgets.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/lib/widgets.dart diff --git a/pkg/analysis_server/test/mock_packages/flutter/pubspec.yaml b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/pubspec.yaml similarity index 100% rename from pkg/analysis_server/test/mock_packages/flutter/pubspec.yaml rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/flutter/pubspec.yaml diff --git a/pkg/analysis_server/test/mock_packages/meta/lib/meta.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/meta/lib/meta.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta.dart diff --git a/pkg/analysis_server/test/mock_packages/meta/lib/meta_meta.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/meta/lib/meta_meta.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/lib/meta_meta.dart diff --git a/pkg/analysis_server/test/mock_packages/meta/pubspec.yaml b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/pubspec.yaml similarity index 100% rename from pkg/analysis_server/test/mock_packages/meta/pubspec.yaml rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/meta/pubspec.yaml diff --git a/pkg/analysis_server/test/mock_packages/pedantic/lib/analysis_options.yaml b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/pedantic/lib/analysis_options.yaml similarity index 100% rename from pkg/analysis_server/test/mock_packages/pedantic/lib/analysis_options.yaml rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/pedantic/lib/analysis_options.yaml diff --git a/pkg/analysis_server/test/mock_packages/ui/lib/geometry.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/geometry.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/ui/lib/geometry.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/geometry.dart diff --git a/pkg/analysis_server/test/mock_packages/ui/lib/painting.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/painting.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/ui/lib/painting.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/painting.dart diff --git a/pkg/analysis_server/test/mock_packages/ui/lib/text.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/text.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/ui/lib/text.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/text.dart diff --git a/pkg/analysis_server/test/mock_packages/ui/lib/ui.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/ui.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/ui/lib/ui.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/ui/lib/ui.dart diff --git a/pkg/analysis_server/test/mock_packages/vector_math/lib/matrix4.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/matrix4.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/vector_math/lib/matrix4.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/matrix4.dart diff --git a/pkg/analysis_server/test/mock_packages/vector_math/lib/vector_math_64.dart b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/vector_math_64.dart similarity index 100% rename from pkg/analysis_server/test/mock_packages/vector_math/lib/vector_math_64.dart rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/lib/vector_math_64.dart diff --git a/pkg/analysis_server/test/mock_packages/vector_math/pubspec.yaml b/pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/pubspec.yaml similarity index 100% rename from pkg/analysis_server/test/mock_packages/vector_math/pubspec.yaml rename to pkg/analyzer_utilities/lib/test/mock_packages/package_content/vector_math/pubspec.yaml diff --git a/pkg/linter/test_data/rules/.dart_tool/package_config.json b/pkg/linter/test_data/rules/.dart_tool/package_config.json index 9d5fbe5fb1f..260e94c0ef9 100644 --- a/pkg/linter/test_data/rules/.dart_tool/package_config.json +++ b/pkg/linter/test_data/rules/.dart_tool/package_config.json @@ -3,13 +3,13 @@ "packages": [ { "name": "flutter", - "rootUri": "../../mock_packages/flutter/", + "rootUri": "../../../../analyzer_utilities/lib/test/mock_packages/package_content/flutter/", "packageUri": "lib/", "languageVersion": "2.17" }, { "name": "meta", - "rootUri": "../../../../analysis_server/test/mock_packages/meta/", + "rootUri": "../../../../analyzer_utilities/lib/test/mock_packages/package_content/meta/", "packageUri": "lib/", "languageVersion": "2.17" } diff --git a/tools/package_deps/bin/package_deps.dart b/tools/package_deps/bin/package_deps.dart index 7c2bc60e231..7fb1375a177 100644 --- a/tools/package_deps/bin/package_deps.dart +++ b/tools/package_deps/bin/package_deps.dart @@ -333,8 +333,8 @@ class Package implements Comparable { if (entity is Directory) { final uriPath = entity.uri.path; const excludedPaths = { - 'pkg/analysis_server/test/mock_packages/', 'pkg/analyzer_cli/test/data/', + 'pkg/analyzer_utilities/lib/test/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/',