Rerun "pub list" when pubspec.lock changes.

pkg/analysis_server/test/context_directory_manager_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.context.directory.manager;
 
 import 'mocks.dart';
 import 'package:analysis_server/src/context_directory_manager.dart';
+import 'package:analysis_server/src/package_map_provider.dart';
 import 'package:analysis_server/src/resource.dart';
+import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:path/path.dart';
 import 'package:unittest/unittest.dart';
-import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/source.dart';
 
 class TestContextDirectoryManager extends ContextDirectoryManager {
-  TestContextDirectoryManager(MemoryResourceProvider provider) : super(provider);
+  TestContextDirectoryManager(
+      MemoryResourceProvider resourceProvider, PackageMapProvider packageMapProvider)
+      : super(resourceProvider, packageMapProvider);
 
   /**
    * Source of timestamps stored in [currentContextFilePaths].
    */
   int now = 0;
 
   final Set<String> currentContextPaths = new Set<String>();
 
   /**
    * Map from context to (map from file path to timestamp of last event)
    */
   final Map<String, Map<String, int>> currentContextFilePaths = <String, Map<String, int>>{};
 
+  /**
+   * Map from context to package map
+   */
+  final Map<String, Map<String, List<Folder>>> currentContextPackageMaps =
+      <String, Map<String, List<Folder>>>{};
+
   @override
-  void addContext(Folder folder) {
+  void addContext(Folder folder, Map<String, List<Folder>> packageMap) {
     String path = folder.path;
     currentContextPaths.add(path);
     currentContextFilePaths[path] = <String, int>{};
+    currentContextPackageMaps[path] = packageMap;
   }
 
   @override
   void applyChangesToContext(Folder contextFolder, ChangeSet changeSet) {
     Map<String, int> filePaths = currentContextFilePaths[contextFolder.path];
     for (Source source in changeSet.addedSources) {
       expect(filePaths, isNot(contains(source.fullName)));
       filePaths[source.fullName] = now;
     }
     for (Source source in changeSet.removedSources) {
       expect(filePaths, contains(source.fullName));
       filePaths.remove(source.fullName);
     }
     for (Source source in changeSet.changedSources) {
       expect(filePaths, contains(source.fullName));
       filePaths[source.fullName] = now;
     }
   }
 
   @override
   void removeContext(Folder folder) {
     String path = folder.path;
     currentContextPaths.remove(path);
     currentContextFilePaths.remove(path);
+    currentContextPackageMaps.remove(path);
+  }
+
+  @override
+  void updateContextPackageMap(Folder contextFolder,
+                               Map<String, List<Folder>> packageMap) {
+    currentContextPackageMaps[contextFolder.path]= packageMap;
   }
 }
 
 main() {
   groupSep = ' | ';
 
   group('ContextDirectoryManager', () {
     TestContextDirectoryManager manager;
-    MemoryResourceProvider provider;
+    MemoryResourceProvider resourceProvider;
+    MockPackageMapProvider packageMapProvider;
 
     setUp(() {
-      provider = new MemoryResourceProvider();
-      manager = new TestContextDirectoryManager(provider);
+      resourceProvider = new MemoryResourceProvider();
+      packageMapProvider = new MockPackageMapProvider();
+      manager = new TestContextDirectoryManager(resourceProvider, packageMapProvider);
     });
 
     test('add folder with pubspec', () {
       String projPath = '/my/proj';
       String pubspecPath = posix.join(projPath, 'pubspec.yaml');
-      provider.newFolder(projPath);
-      provider.newFile(pubspecPath, 'pubspec');
+      resourceProvider.newFolder(projPath);
+      resourceProvider.newFile(pubspecPath, 'pubspec');
       manager.setRoots(<String>[projPath], <String>[]);
       expect(manager.currentContextPaths, hasLength(1));
       expect(manager.currentContextPaths, contains(projPath));
       expect(manager.currentContextFilePaths[projPath], hasLength(0));
     });
 
+    test('newly added folders get proper package map', () {
+      String projPath = '/my/proj';
+      String packagePath = '/package/foo';
+      resourceProvider.newFolder(projPath);
+      Folder packageFolder = resourceProvider.newFolder(packagePath);
+      packageMapProvider.packageMap = {'foo': [packageFolder]};
+      manager.setRoots(<String>[projPath], <String>[]);
+      expect(manager.currentContextPackageMaps[projPath],
+          equals(packageMapProvider.packageMap));
+    });
+
     test('add folder without pubspec', () {
       String projPath = '/my/proj';
-      provider.newFolder(projPath);
+      resourceProvider.newFolder(projPath);
       manager.setRoots(<String>[projPath], <String>[]);
       expect(manager.currentContextPaths, hasLength(1));
       expect(manager.currentContextPaths, contains(projPath));
       expect(manager.currentContextFilePaths[projPath], hasLength(0));
     });
 
     test('add folder with dart file', () {
       String projPath = '/my/proj';
-      provider.newFolder(projPath);
+      resourceProvider.newFolder(projPath);
       String filePath = posix.join(projPath, 'foo.dart');
-      provider.newFile(filePath, 'contents');
+      resourceProvider.newFile(filePath, 'contents');
       manager.setRoots(<String>[projPath], <String>[]);
       var filePaths = manager.currentContextFilePaths[projPath];
       expect(filePaths, hasLength(1));
       expect(filePaths, contains(filePath));
     });
 
     test('add folder with dart file in subdir', () {
       String projPath = '/my/proj';
-      provider.newFolder(projPath);
+      resourceProvider.newFolder(projPath);
       String filePath = posix.join(projPath, 'foo', 'bar.dart');
-      provider.newFile(filePath, 'contents');
+      resourceProvider.newFile(filePath, 'contents');
       manager.setRoots(<String>[projPath], <String>[]);
       var filePaths = manager.currentContextFilePaths[projPath];
       expect(filePaths, hasLength(1));
       expect(filePaths, contains(filePath));
     });
 
     test('remove folder with pubspec', () {
       String projPath = '/my/proj';
       String pubspecPath = posix.join(projPath, 'pubspec.yaml');
-      provider.newFolder(projPath);
-      provider.newFile(pubspecPath, 'pubspec');
+      resourceProvider.newFolder(projPath);
+      resourceProvider.newFile(pubspecPath, 'pubspec');
       manager.setRoots(<String>[projPath], <String>[]);
       manager.setRoots(<String>[], <String>[]);
       expect(manager.currentContextPaths, hasLength(0));
       expect(manager.currentContextFilePaths, hasLength(0));
     });
 
     test('remove folder without pubspec', () {
       String projPath = '/my/proj';
-      provider.newFolder(projPath);
+      resourceProvider.newFolder(projPath);
       manager.setRoots(<String>[projPath], <String>[]);
       manager.setRoots(<String>[], <String>[]);
       expect(manager.currentContextPaths, hasLength(0));
       expect(manager.currentContextFilePaths, hasLength(0));
     });
 
     test('ignore files in packages dir', () {
       String projPath = '/my/proj';
-      provider.newFolder(projPath);
+      resourceProvider.newFolder(projPath);
       String pubspecPath = posix.join(projPath, 'pubspec.yaml');
-      provider.newFile(pubspecPath, 'pubspec');
+      resourceProvider.newFile(pubspecPath, 'pubspec');
       String filePath1 = posix.join(projPath, 'packages', 'file1.dart');
-      provider.newFile(filePath1, 'contents');
+      resourceProvider.newFile(filePath1, 'contents');
       manager.setRoots(<String>[projPath], <String>[]);
       Map<String, int> filePaths = manager.currentContextFilePaths[projPath];
       expect(filePaths, hasLength(0));
       String filePath2 = posix.join(projPath, 'packages', 'file2.dart');
-      provider.newFile(filePath2, 'contents');
+      resourceProvider.newFile(filePath2, 'contents');
       return pumpEventQueue().then((_) {
         expect(filePaths, hasLength(0));
       });
     });
 
     group('detect context modifications', () {
       String projPath;
 
       setUp(() {
         projPath = '/my/proj';
-        provider.newFolder(projPath);
+        resourceProvider.newFolder(projPath);
       });
 
       test('Add file', () {
         manager.setRoots(<String>[projPath], <String>[]);
         Map<String, int> filePaths = manager.currentContextFilePaths[projPath];
         expect(filePaths, hasLength(0));
         String filePath = posix.join(projPath, 'foo.dart');
-        provider.newFile(filePath, 'contents');
+        resourceProvider.newFile(filePath, 'contents');
         return pumpEventQueue().then((_) {
           expect(filePaths, hasLength(1));
           expect(filePaths, contains(filePath));
         });
       });
 
       test('Add file in subdirectory', () {
         manager.setRoots(<String>[projPath], <String>[]);
         Map<String, int> filePaths = manager.currentContextFilePaths[projPath];
         expect(filePaths, hasLength(0));
         String filePath = posix.join(projPath, 'foo', 'bar.dart');
-        provider.newFile(filePath, 'contents');
+        resourceProvider.newFile(filePath, 'contents');
         return pumpEventQueue().then((_) {
           expect(filePaths, hasLength(1));
           expect(filePaths, contains(filePath));
         });
       });
 
       test('Delete file', () {
         String filePath = posix.join(projPath, 'foo.dart');
-        provider.newFile(filePath, 'contents');
+        resourceProvider.newFile(filePath, 'contents');
         manager.setRoots(<String>[projPath], <String>[]);
         Map<String, int> filePaths = manager.currentContextFilePaths[projPath];
         expect(filePaths, hasLength(1));
         expect(filePaths, contains(filePath));
-        provider.deleteFile(filePath);
+        resourceProvider.deleteFile(filePath);
         return pumpEventQueue().then((_) => expect(filePaths, hasLength(0)));
       });
 
       test('Modify file', () {
         String filePath = posix.join(projPath, 'foo.dart');
-        provider.newFile(filePath, 'contents');
+        resourceProvider.newFile(filePath, 'contents');
         manager.setRoots(<String>[projPath], <String>[]);
         Map<String, int> filePaths = manager.currentContextFilePaths[projPath];
         expect(filePaths, hasLength(1));
         expect(filePaths, contains(filePath));
         expect(filePaths[filePath], equals(manager.now));
         manager.now++;
-        provider.modifyFile(filePath, 'new contents');
+        resourceProvider.modifyFile(filePath, 'new contents');
         return pumpEventQueue().then((_) => expect(filePaths[filePath], equals(
             manager.now)));
       });
+
+      test('Modify package map dependency', () {
+        String dependencyPath = posix.join(projPath, 'dep');
+        resourceProvider.newFile(dependencyPath, 'contents');
+        String dartFilePath = posix.join(projPath, 'main.dart');
+        resourceProvider.newFile(dartFilePath, 'contents');
+        packageMapProvider.dependencies.add(dependencyPath);
+        manager.setRoots(<String>[projPath], <String>[]);
+        expect(manager.currentContextPackageMaps[projPath],
+            equals(packageMapProvider.packageMap));
+        String packagePath = '/package/foo';
+        resourceProvider.newFolder(projPath);
+        packageMapProvider.packageMap = {'foo': projPath};
+        // Changing a .dart file in the project shouldn't cause a new
+        // package map to be picked up.
+        resourceProvider.modifyFile(dartFilePath, 'new contents');
+        return pumpEventQueue().then((_) {
+          expect(manager.currentContextPackageMaps[projPath], isEmpty);
+          // However, changing the package map dependency should.
+          resourceProvider.modifyFile(dependencyPath, 'new contents');
+          return pumpEventQueue().then((_) {
+            expect(manager.currentContextPackageMaps[projPath],
+                equals(packageMapProvider.packageMap));
+          });
+        });
+      });
     });
   });
 }