Skip to content

Commit 7431e88

Browse files
srawlinsCommit Queue
authored and
Commit Queue
committed
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';

pkg/analyzer/test/src/diagnostics/invalid_export_of_internal_element_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:analyzer/src/error/codes.dart';
6-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
6+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
77
import 'package:test_reflective_loader/test_reflective_loader.dart';
88

99
import '../dart/resolution/context_collection_resolution.dart';

pkg/analyzer_plugin/test/support/abstract_context.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine;
1313
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
1414
import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
1515
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
16+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
1617
import 'package:analyzer_utilities/test/experiments/experiments.dart';
17-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
1818
import 'package:linter/src/rules.dart';
1919
import 'package:meta/meta.dart';
2020

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
include: package:lints/recommended.yaml
2+
3+
analyzer:
4+
exclude:
5+
- lib/mock_packages/package_content/**
6+
language:
7+
strict-casts: true
8+
strict-inference: true
9+
strict-raw-types: true
10+
11+
linter:
12+
rules:
13+
- avoid_dynamic_calls
14+
- avoid_unused_constructor_parameters
15+
- flutter_style_todos
16+
- library_annotations
17+
- prefer_single_quotes
18+
- unawaited_futures
19+
- unnecessary_breaks
20+
- unnecessary_ignore
21+
- unnecessary_library_directive
22+
- unnecessary_parenthesis
23+
- unreachable_from_main

pkg/analyzer_testing/api.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,31 @@
1+
package:analyzer_testing/mock_packages/mock_packages.dart:
2+
BlazeMockPackages (class extends Object):
3+
instance (static getter: BlazeMockPackages)
4+
addFlutter (method: void Function(ResourceProvider))
5+
addMeta (method: void Function(ResourceProvider))
6+
MockPackagesMixin (mixin on Object):
7+
packagesRootPath (getter: String)
8+
pathContext (getter: Context)
9+
resourceProvider (getter: ResourceProvider)
10+
addAngularMeta (method: Folder Function())
11+
addFfi (method: Folder Function())
12+
addFixnum (method: Folder Function())
13+
addFlutter (method: Folder Function())
14+
addFlutterTest (method: Folder Function())
15+
addJs (method: Folder Function())
16+
addKernel (method: Folder Function())
17+
addMeta (method: Folder Function())
18+
addPedantic (method: Folder Function())
19+
addTestReflectiveLoader (method: Folder Function())
20+
addUI (method: Folder Function())
21+
addVectorMath (method: Folder Function())
122
package:analyzer_testing/package_root.dart:
223
packageRoot (static getter: String)
324
dart:core:
25+
Object (referenced)
426
String (referenced)
27+
package:analyzer/file_system/file_system.dart:
28+
Folder (referenced)
29+
ResourceProvider (referenced)
30+
package:path/src/context.dart:
31+
Context (referenced)

pkg/analyzer_utilities/lib/test/mock_packages/mock_packages.dart renamed to pkg/analyzer_testing/lib/mock_packages/mock_packages.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ void _cacheFiles(Map<String, String> cachedFiles) {
1515
var packageRoot = pathContext.normalize(package_root.packageRoot);
1616
var mockPath = pathContext.join(
1717
packageRoot,
18-
'analyzer_utilities',
18+
'analyzer_testing',
1919
'lib',
20-
'test',
2120
'mock_packages',
2221
'package_content',
2322
);

pkg/analyzer_testing/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ environment:
66
resolution: workspace
77

88
dependencies:
9+
analyzer: ^8.0.0-dev
910
path: ^1.9.0
1011

1112
# We use 'any' version constraints here as we get our package versions from

pkg/analyzer_utilities/analysis_options.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
include: package:lints/recommended.yaml
22

33
analyzer:
4-
exclude:
5-
- lib/test/mock_packages/package_content/**
64
language:
75
strict-casts: true
86
strict-inference: true

pkg/analyzer_utilities/pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ resolution: workspace
99

1010
# Use 'any' constraints here; we get our versions from the DEPS file.
1111
dependencies:
12-
analyzer_testing: any
1312
analyzer: any
1413
collection: any
1514
dart_style: any

pkg/linter/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies:
2323

2424
# Use 'any' constraints here; we get our versions from the DEPS file.
2525
dev_dependencies:
26+
analyzer_testing: any
2627
analyzer_utilities: any
2728
args: any
2829
cli_util: any

pkg/linter/test/rule_test_support.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import 'package:analyzer/src/lint/util.dart';
2121
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
2222
import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
2323
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
24+
import 'package:analyzer_testing/mock_packages/mock_packages.dart';
2425
import 'package:analyzer_utilities/test/experiments/experiments.dart';
25-
import 'package:analyzer_utilities/test/mock_packages/mock_packages.dart';
2626
import 'package:analyzer_utilities/testing/test_support.dart';
2727
import 'package:collection/collection.dart';
2828
import 'package:linter/src/analyzer.dart';

tools/package_deps/bin/package_deps.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ class Package implements Comparable<Package> {
335335
final uriPath = entity.uri.path;
336336
const excludedPaths = {
337337
'pkg/analyzer_cli/test/data/',
338-
'pkg/analyzer_utilities/lib/test/mock_packages/package_content/',
338+
'pkg/analyzer_testing/lib/mock_packages/package_content/',
339339
'pkg/front_end/test/id_testing/data/',
340340
'pkg/front_end/test/enable_non_nullable/data/',
341341
'pkg/front_end/test/language_versioning/data/',

0 commit comments

Comments
 (0)