Move the mock package support to analyzer_utilities
Change-Id: I9d0a2d9e3e85d147ce7c7d0c14ea6c179c6f70de Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/359740 Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Devon Carew <devoncarew@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
committed by
Commit Queue
parent
cc3b3f4976
commit
acb94a7da4
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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].
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
include: package:lints/recommended.yaml
|
||||
|
||||
analyzer:
|
||||
exclude:
|
||||
- lib/test/mock_packages/package_content/**
|
||||
language:
|
||||
strict-casts: true
|
||||
strict-inference: true
|
||||
|
||||
+4
-1
@@ -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<String, String> 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) {
|
||||
@@ -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"
|
||||
}
|
||||
|
||||
@@ -333,8 +333,8 @@ class Package implements Comparable<Package> {
|
||||
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/',
|
||||
|
||||
Reference in New Issue
Block a user