Skip to content

Commit 7431e88

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer_testing: Move in the mock packages.
Work towards #55660 Change-Id: Ic789b8347d3bfc71a02af423fbb1a8c58da7b32d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424921 Reviewed-by: Ivan Inozemtsev <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Konstantin Shcheglov <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent e45f0df commit 7431e88

File tree

93 files changed

+66
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+66
-19
lines changed

pkg/analysis_server/test/abstract_context.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import 'package:analyzer/src/test_utilities/platform.dart';
1919
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
2020
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
2121
import 'package:analyzer/src/utilities/extensions/file_system.dart';
22+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
2223
import 'package:analyzer_utilities/test/experiments/experiments.dart';
23-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
2424
import 'package:linter/src/rules.dart';
2525
import 'package:meta/meta.dart';
2626
import 'package:test/test.dart';

pkg/analysis_server/test/analysis_server_base.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import 'package:analyzer/src/test_utilities/mock_sdk.dart';
1919
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
2020
import 'package:analyzer/src/test_utilities/test_code_format.dart';
2121
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
22+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
2223
import 'package:analyzer_utilities/test/experiments/experiments.dart';
23-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
2424
import 'package:analyzer_utilities/testing/test_support.dart';
2525
import 'package:meta/meta.dart';
2626
import 'package:test/test.dart';

pkg/analysis_server/test/integration/support/integration_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'package:analysis_server/src/services/pub/pub_command.dart';
1313
import 'package:analyzer/file_system/physical_file_system.dart';
1414
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
1515
import 'package:analyzer_plugin/protocol/protocol_common.dart';
16-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
16+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
1717
import 'package:analyzer_utilities/testing/test_support.dart';
1818
import 'package:meta/meta.dart';
1919
import 'package:path/path.dart' as path;

pkg/analysis_server/test/lsp/server_abstract.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import 'package:analyzer/src/util/file_paths.dart' as file_paths;
2323
import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
2424
import 'package:analyzer_plugin/src/protocol/protocol_internal.dart' as plugin;
2525
import 'package:analyzer_plugin/src/utilities/client_uri_converter.dart';
26+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
2627
import 'package:analyzer_utilities/test/experiments/experiments.dart';
27-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
2828
import 'package:collection/collection.dart';
2929
import 'package:language_server_protocol/json_parsing.dart';
3030
import 'package:meta/meta.dart';

pkg/analysis_server/test/src/cider/assists_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:analyzer/source/line_info.dart';
1010
import 'package:analyzer/src/test_utilities/test_code_format.dart';
1111
import 'package:analyzer_plugin/protocol/protocol_common.dart' show SourceEdit;
1212
import 'package:analyzer_plugin/utilities/assist/assist.dart';
13-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
13+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
1414
import 'package:test/test.dart';
1515
import 'package:test_reflective_loader/test_reflective_loader.dart';
1616

pkg/analysis_server/test/src/cider/document_symbols_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'package:analysis_server/lsp_protocol/protocol.dart';
66
import 'package:analysis_server/src/cider/document_symbols.dart';
7-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
7+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
88
import 'package:test/expect.dart';
99
import 'package:test_reflective_loader/test_reflective_loader.dart';
1010

pkg/analysis_server/test/src/cider/rename_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:analysis_server/src/cider/rename.dart';
66
import 'package:analyzer/source/line_info.dart';
77
import 'package:analyzer/src/test_utilities/test_code_format.dart';
88
import 'package:analyzer_plugin/protocol/protocol_common.dart';
9-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
9+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
1010
import 'package:test/test.dart';
1111
import 'package:test_reflective_loader/test_reflective_loader.dart';
1212

pkg/analysis_server/test/support/configuration_files.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import 'package:analyzer/src/dart/analysis/experiments.dart';
88
import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
99
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
1010
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
11+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
1112
import 'package:analyzer_testing/package_root.dart' as package_root;
12-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
1313

1414
/// A mixin adding functionality to write `.dart_tool/package_config.json`
1515
/// files along with mock packages to a [ResourceProvider].

pkg/analysis_server/test/verify_sorted_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ void buildTests({
7676

7777
void buildTestsForAnalysisServer() {
7878
var excludedPaths = <String>[
79-
'test/mock_packages',
8079
// TODO(brianwilkerson): Fix the generator to sort the generated files and
8180
// remove these exclusions.
8281
'lib/protocol/protocol_constants.dart',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import 'package:analyzer/src/workspace/basic.dart';
2323
import 'package:analyzer/src/workspace/blaze.dart';
2424
import 'package:analyzer/src/workspace/gn.dart';
2525
import 'package:analyzer/src/workspace/pub.dart';
26+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
2627
import 'package:analyzer_utilities/test/experiments/experiments.dart';
27-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
2828
import 'package:analyzer_utilities/testing/test_support.dart';
2929
import 'package:analyzer_utilities/testing/tree_string_sink.dart';
3030
import 'package:linter/src/rules.dart';

0 commit comments

Comments
 (0)