analyzer_testing: Move in the mock packages.
Work towards https://github.com/dart-lang/sdk/issues/55660 Change-Id: Ic789b8347d3bfc71a02af423fbb1a8c58da7b32d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/424921 Reviewed-by: Ivan Inozemtsev <iinozemtsev@google.com> Commit-Queue: Samuel Rawlins <srawlins@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
committed by
Commit Queue
parent
e45f0dff73
commit
7431e885e8
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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].
|
||||
|
||||
@@ -76,7 +76,6 @@ void buildTests({
|
||||
|
||||
void buildTestsForAnalysisServer() {
|
||||
var excludedPaths = <String>[
|
||||
'test/mock_packages',
|
||||
// TODO(brianwilkerson): Fix the generator to sort the generated files and
|
||||
// remove these exclusions.
|
||||
'lib/protocol/protocol_constants.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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -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)
|
||||
|
||||
+1
-2
@@ -15,9 +15,8 @@ void _cacheFiles(Map<String, String> cachedFiles) {
|
||||
var packageRoot = pathContext.normalize(package_root.packageRoot);
|
||||
var mockPath = pathContext.join(
|
||||
packageRoot,
|
||||
'analyzer_utilities',
|
||||
'analyzer_testing',
|
||||
'lib',
|
||||
'test',
|
||||
'mock_packages',
|
||||
'package_content',
|
||||
);
|
||||
@@ -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
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
include: package:lints/recommended.yaml
|
||||
|
||||
analyzer:
|
||||
exclude:
|
||||
- lib/test/mock_packages/package_content/**
|
||||
language:
|
||||
strict-casts: true
|
||||
strict-inference: true
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -335,7 +335,7 @@ class Package implements Comparable<Package> {
|
||||
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/',
|
||||
|
||||
Reference in New Issue
Block a user