Handle file additions/removals in ContextDirectoryManager.

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/resource.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);
 
   final Set<String> currentContextPaths = new Set<String>();
   final Map<String, String> currentContextPubspecPaths = <String, String>{};
   final Map<String, Set<String>> currentContextFilePaths = <String, Set<String>>{};
 
   @override
   void addContext(Folder folder, File pubspecFile) {
-    currentContextPaths.add(folder.fullName);
-    currentContextPubspecPaths[folder.fullName] = pubspecFile != null ? pubspecFile.fullName : null;
-    currentContextFilePaths[folder.fullName] = new Set<String>();
+    currentContextPaths.add(folder.path);
+    currentContextPubspecPaths[folder.path] = pubspecFile != null ? pubspecFile.path : null;
+    currentContextFilePaths[folder.path] = new Set<String>();
   }
 
   @override
   void applyChangesToContext(Folder contextFolder, ChangeSet changeSet) {
-    Set<String> filePaths = currentContextFilePaths[contextFolder.fullName];
+    Set<String> filePaths = currentContextFilePaths[contextFolder.path];
     for (Source source in changeSet.addedSources) {
+      expect(filePaths, isNot(contains(source.fullName)));
       filePaths.add(source.fullName);
     }
-    // TODO(paulberry): handle source.changedSources and source.removedSources.
+    for (Source source in changeSet.removedSources) {
+      expect(filePaths, contains(source.fullName));
+      filePaths.remove(source.fullName);
+    }
+    // TODO(paulberry): handle source.changedSources.
   }
 }
 
 main() {
   groupSep = ' | ';
 
   group('ContextDirectoryManager', () {
     TestContextDirectoryManager manager;
     MemoryResourceProvider provider;
 
@@ skipping 38 matching lines @@
     test('add folder with dart file in subdir', () {
       String projPath = '/my/proj';
       provider.newFolder(projPath);
       String filePath = posix.join(projPath, 'foo', 'bar.dart');
       provider.newFile(filePath, 'contents');
       manager.setRoots(<String>[projPath], <String>[]);
       var filePaths = manager.currentContextFilePaths[projPath];
       expect(filePaths, hasLength(1));
       expect(filePaths, contains(filePath));
     });
+
+    group('detect context modifications', () {
+      String projPath;
+
+      setUp(() {
+        projPath = '/my/proj';
+        provider.newFolder(projPath);
+      });
+
+      test('Add file', () {
+        manager.setRoots(<String>[projPath], <String>[]);
+        Set<String> filePaths = manager.currentContextFilePaths[projPath];
+        expect(filePaths, hasLength(0));
+        String filePath = posix.join(projPath, 'foo.dart');
+        provider.newFile(filePath, 'contents');
+        return pumpEventQueue().then((_) {
+          expect(filePaths, hasLength(1));
+          expect(filePaths, contains(filePath));
+        });
+      });
+
+      test('Add file in subdirectory', () {
+        manager.setRoots(<String>[projPath], <String>[]);
+        Set<String> filePaths = manager.currentContextFilePaths[projPath];
+        expect(filePaths, hasLength(0));
+        String filePath = posix.join(projPath, 'foo', 'bar.dart');
+        provider.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');
+        manager.setRoots(<String>[projPath], <String>[]);
+        Set<String> filePaths = manager.currentContextFilePaths[projPath];
+        expect(filePaths, hasLength(1));
+        expect(filePaths, contains(filePath));
+        provider.deleteFile(filePath);
+        return pumpEventQueue().then((_) => expect(filePaths, hasLength(0)));
+      });
+    });
   });
 }