| Index: pkg/analyzer/test/source/package_map_provider_test.dart
|
| diff --git a/pkg/analyzer/test/source/package_map_provider_test.dart b/pkg/analyzer/test/source/package_map_provider_test.dart
|
| index 839db68d73ac25bed83f7db00d58662fcb965a48..311a5f57c19a3f2add68caa911e43b00e8476c02 100644
|
| --- a/pkg/analyzer/test/source/package_map_provider_test.dart
|
| +++ b/pkg/analyzer/test/source/package_map_provider_test.dart
|
| @@ -6,10 +6,10 @@ library test.package.map.provider;
|
|
|
| import 'dart:convert';
|
|
|
| -import 'package:analyzer/source/package_map_provider.dart';
|
| -import 'package:analyzer/source/pub_package_map_provider.dart';
|
| import 'package:analyzer/file_system/file_system.dart';
|
| import 'package:analyzer/file_system/memory_file_system.dart';
|
| +import 'package:analyzer/source/package_map_provider.dart';
|
| +import 'package:analyzer/source/pub_package_map_provider.dart';
|
| import 'package:analyzer/src/generated/sdk_io.dart';
|
| import 'package:unittest/unittest.dart';
|
|
|
| @@ -25,20 +25,26 @@ main() {
|
|
|
| setUp(() {
|
| resourceProvider = new MemoryResourceProvider();
|
| - packageMapProvider = new PubPackageMapProvider(resourceProvider, DirectoryBasedDartSdk.defaultSdk);
|
| + packageMapProvider =
|
| + new PubPackageMapProvider(resourceProvider, DirectoryBasedDartSdk.defaultSdk);
|
| projectFolder = resourceProvider.newFolder(projectPath);
|
| });
|
|
|
| PackageMapInfo parsePackageMap(Object obj) {
|
| - return packageMapProvider.parsePackageMap(JSON.encode(obj), projectFolder);
|
| + return packageMapProvider.parsePackageMap(
|
| + JSON.encode(obj),
|
| + projectFolder);
|
| }
|
|
|
| test('normal folder', () {
|
| String packageName = 'foo';
|
| String folderPath = '/path/to/folder';
|
| resourceProvider.newFolder(folderPath);
|
| - Map<String, List<Folder>> result = parsePackageMap(
|
| - {'packages': {packageName: folderPath}}).packageMap;
|
| + Map<String, List<Folder>> result = parsePackageMap({
|
| + 'packages': {
|
| + packageName: folderPath
|
| + }
|
| + }).packageMap;
|
| expect(result, hasLength(1));
|
| expect(result.keys, contains(packageName));
|
| expect(result[packageName], hasLength(1));
|
| @@ -49,8 +55,11 @@ main() {
|
| test('ignore nonexistent folder', () {
|
| String packageName = 'foo';
|
| String folderPath = '/path/to/folder';
|
| - Map<String, List<Folder>> result = parsePackageMap(
|
| - {'packages': {packageName: folderPath}}).packageMap;
|
| + Map<String, List<Folder>> result = parsePackageMap({
|
| + 'packages': {
|
| + packageName: folderPath
|
| + }
|
| + }).packageMap;
|
| expect(result, hasLength(0));
|
| });
|
|
|
| @@ -60,8 +69,11 @@ main() {
|
| String folderPath2 = '/path/to/folder2';
|
| resourceProvider.newFolder(folderPath1);
|
| resourceProvider.newFolder(folderPath2);
|
| - Map<String, List<Folder>> result = parsePackageMap(
|
| - {'packages': {packageName: [folderPath1, folderPath2]}}).packageMap;
|
| + Map<String, List<Folder>> result = parsePackageMap({
|
| + 'packages': {
|
| + packageName: [folderPath1, folderPath2]
|
| + }
|
| + }).packageMap;
|
| expect(result, hasLength(1));
|
| expect(result.keys, contains(packageName));
|
| expect(result[packageName], hasLength(2));
|
| @@ -76,8 +88,10 @@ main() {
|
| String path2 = '/path/to/folder2/pubspec.lock';
|
| resourceProvider.newFile(path1, '...');
|
| resourceProvider.newFile(path2, '...');
|
| - Set<String> dependencies = parsePackageMap(
|
| - {'packages': {}, 'input_files': [path1, path2]}).dependencies;
|
| + Set<String> dependencies = parsePackageMap({
|
| + 'packages': {},
|
| + 'input_files': [path1, path2]
|
| + }).dependencies;
|
| expect(dependencies, hasLength(2));
|
| expect(dependencies, contains(path1));
|
| expect(dependencies, contains(path2));
|
| @@ -89,8 +103,11 @@ main() {
|
| String packageName = 'foo';
|
| resourceProvider.newFolder(projectPath);
|
| resourceProvider.newFolder(packagePath);
|
| - Map<String, List<Folder>> result = parsePackageMap(
|
| - {'packages': {packageName: [relativePackagePath]}}).packageMap;
|
| + Map<String, List<Folder>> result = parsePackageMap({
|
| + 'packages': {
|
| + packageName: [relativePackagePath]
|
| + }
|
| + }).packageMap;
|
| expect(result[packageName][0].path, equals(packagePath));
|
| });
|
|
|
| @@ -99,8 +116,10 @@ main() {
|
| String relativeDependencyPath = '../pubspec.lock';
|
| resourceProvider.newFolder(projectPath);
|
| resourceProvider.newFile(dependencyPath, 'contents');
|
| - Set<String> dependencies = parsePackageMap(
|
| - {'packages': {}, 'input_files': [relativeDependencyPath]}).dependencies;
|
| + Set<String> dependencies = parsePackageMap({
|
| + 'packages': {},
|
| + 'input_files': [relativeDependencyPath]
|
| + }).dependencies;
|
| expect(dependencies, hasLength(1));
|
| expect(dependencies, contains(dependencyPath));
|
| });
|
|
|