Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: pkg/analyzer/test/source/package_map_provider_test.dart

Issue 1470793002: Don't run 'pub list-package-dirs' if there is no pubpsec.lock file. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analyzer/lib/source/pub_package_map_provider.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 af5bedf26cc56779cc53be2612d89efb45b58ac8..37016307d005a7cde57912095b507264fb35d414 100644
--- a/pkg/analyzer/test/source/package_map_provider_test.dart
+++ b/pkg/analyzer/test/source/package_map_provider_test.dart
@@ -8,119 +8,132 @@ 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.dart';
import 'package:analyzer/src/generated/sdk_io.dart';
import 'package:unittest/unittest.dart';
+import '../reflective_tests.dart';
import '../utils.dart';
main() {
initializeTestEnvironment();
+ runReflectiveTests(PubPackageMapProviderTest);
+}
- group('PubPackageMapProvider', () {
- group('parsePackageMap', () {
- MemoryResourceProvider resourceProvider;
- PubPackageMapProvider packageMapProvider;
- const String projectPath = '/path/to/project';
- Folder projectFolder;
+@reflectiveTest
+class PubPackageMapProviderTest {
+ static const String projectPath = '/path/to/project';
- setUp(() {
- resourceProvider = new MemoryResourceProvider();
- packageMapProvider = new PubPackageMapProvider(
- resourceProvider, DirectoryBasedDartSdk.defaultSdk);
- projectFolder = resourceProvider.newFolder(projectPath);
- });
+ DartSdk sdk = DirectoryBasedDartSdk.defaultSdk;
+ MemoryResourceProvider resourceProvider;
+ PubPackageMapProvider packageMapProvider;
+ Folder projectFolder;
- PackageMapInfo parsePackageMap(Object obj) {
- return packageMapProvider.parsePackageMap(obj, projectFolder);
- }
+ PackageMapInfo parsePackageMap(Map obj) {
+ return packageMapProvider.parsePackageMap(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;
- expect(result, hasLength(1));
- expect(result.keys, contains(packageName));
- expect(result[packageName], hasLength(1));
- expect(result[packageName][0], new isInstanceOf<Folder>());
- expect(result[packageName][0].path, equals(folderPath));
- });
+ void setUp() {
+ resourceProvider = new MemoryResourceProvider();
+ packageMapProvider = new PubPackageMapProvider(resourceProvider, sdk);
+ projectFolder = resourceProvider.newFolder(projectPath);
+ }
- test("don't ignore nonexistent folder", () {
- String packageName = 'foo';
- String folderPath = '/path/to/folder';
- Map<String, List<Folder>> result = parsePackageMap({
- 'packages': {packageName: folderPath}
- }).packageMap;
- expect(result, hasLength(1));
- expect(result.keys, contains(packageName));
- expect(result[packageName], hasLength(1));
- expect(result[packageName][0], new isInstanceOf<Folder>());
- expect(result[packageName][0].path, equals(folderPath));
- });
+ void test_computePackageMap_noLockFile() {
+ packageMapProvider =
+ new PubPackageMapProvider(resourceProvider, sdk, (Folder folder) {
+ fail('Unexpected "pub list" invocation');
+ });
+ PackageMapInfo info = packageMapProvider.computePackageMap(projectFolder);
+ expect(info.packageMap, isNull);
+ expect(info.dependencies, unorderedEquals(['$projectPath/pubspec.lock']));
+ }
- test('package maps to list', () {
- String packageName = 'foo';
- String folderPath1 = '/path/to/folder1';
- String folderPath2 = '/path/to/folder2';
- resourceProvider.newFolder(folderPath1);
- resourceProvider.newFolder(folderPath2);
- 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));
- for (int i = 0; i < 2; i++) {
- expect(result[packageName][i], new isInstanceOf<Folder>());
- expect(result[packageName][i].path, isIn([folderPath1, folderPath2]));
- }
- });
+ void test_parsePackageMap_dontIgnoreNonExistingFolder() {
+ String packageName = 'foo';
+ String folderPath = '/path/to/folder';
+ Map<String, List<Folder>> result = parsePackageMap({
+ 'packages': {packageName: folderPath}
+ }).packageMap;
+ expect(result, hasLength(1));
+ expect(result.keys, contains(packageName));
+ expect(result[packageName], hasLength(1));
+ expect(result[packageName][0], new isInstanceOf<Folder>());
+ expect(result[packageName][0].path, equals(folderPath));
+ }
- test('Handle dependencies', () {
- String path1 = '/path/to/folder1/pubspec.lock';
- String path2 = '/path/to/folder2/pubspec.lock';
- resourceProvider.newFile(path1, '...');
- resourceProvider.newFile(path2, '...');
- Set<String> dependencies = parsePackageMap({
- 'packages': {},
- 'input_files': [path1, path2]
- }).dependencies;
- expect(dependencies, hasLength(2));
- expect(dependencies, contains(path1));
- expect(dependencies, contains(path2));
- });
+ void test_parsePackageMap_handleDependencies() {
+ String path1 = '/path/to/folder1/pubspec.lock';
+ String path2 = '/path/to/folder2/pubspec.lock';
+ resourceProvider.newFile(path1, '...');
+ resourceProvider.newFile(path2, '...');
+ Set<String> dependencies = parsePackageMap({
+ 'packages': {},
+ 'input_files': [path1, path2]
+ }).dependencies;
+ expect(dependencies, hasLength(2));
+ expect(dependencies, contains(path1));
+ expect(dependencies, contains(path2));
+ }
- test('Relative path in packages', () {
- String packagePath = '/path/to/package';
- String relativePackagePath = '../package';
- String packageName = 'foo';
- resourceProvider.newFolder(projectPath);
- resourceProvider.newFolder(packagePath);
- Map<String, List<Folder>> result = parsePackageMap({
- 'packages': {
- packageName: [relativePackagePath]
- }
- }).packageMap;
- expect(result[packageName][0].path, equals(packagePath));
- });
+ void test_parsePackageMap_normalFolder() {
+ String packageName = 'foo';
+ String folderPath = '/path/to/folder';
+ resourceProvider.newFolder(folderPath);
+ Map<String, List<Folder>> result = parsePackageMap({
+ 'packages': {packageName: folderPath}
+ }).packageMap;
+ expect(result, hasLength(1));
+ expect(result.keys, contains(packageName));
+ expect(result[packageName], hasLength(1));
+ expect(result[packageName][0], new isInstanceOf<Folder>());
+ expect(result[packageName][0].path, equals(folderPath));
+ }
- test('Relative path in dependencies', () {
- String dependencyPath = '/path/to/pubspec.lock';
- String relativeDependencyPath = '../pubspec.lock';
- resourceProvider.newFolder(projectPath);
- resourceProvider.newFile(dependencyPath, 'contents');
- Set<String> dependencies = parsePackageMap({
- 'packages': {},
- 'input_files': [relativeDependencyPath]
- }).dependencies;
- expect(dependencies, hasLength(1));
- expect(dependencies, contains(dependencyPath));
- });
- });
- });
+ void test_parsePackageMap_packageMapsToList() {
+ String packageName = 'foo';
+ String folderPath1 = '/path/to/folder1';
+ String folderPath2 = '/path/to/folder2';
+ resourceProvider.newFolder(folderPath1);
+ resourceProvider.newFolder(folderPath2);
+ 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));
+ for (int i = 0; i < 2; i++) {
+ expect(result[packageName][i], new isInstanceOf<Folder>());
+ expect(result[packageName][i].path, isIn([folderPath1, folderPath2]));
+ }
+ }
+
+ void test_parsePackageMap_relativePahInPackages() {
+ String packagePath = '/path/to/package';
+ String relativePackagePath = '../package';
+ String packageName = 'foo';
+ resourceProvider.newFolder(projectPath);
+ resourceProvider.newFolder(packagePath);
+ Map<String, List<Folder>> result = parsePackageMap({
+ 'packages': {
+ packageName: [relativePackagePath]
+ }
+ }).packageMap;
+ expect(result[packageName][0].path, equals(packagePath));
+ }
+
+ void test_parsePackageMap_relativePathInDependencies() {
+ String dependencyPath = '/path/to/pubspec.lock';
+ String relativeDependencyPath = '../pubspec.lock';
+ resourceProvider.newFolder(projectPath);
+ resourceProvider.newFile(dependencyPath, 'contents');
+ Set<String> dependencies = parsePackageMap({
+ 'packages': {},
+ 'input_files': [relativeDependencyPath]
+ }).dependencies;
+ expect(dependencies, hasLength(1));
+ expect(dependencies, contains(dependencyPath));
+ }
}
« no previous file with comments | « pkg/analyzer/lib/source/pub_package_map_provider.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698