Improve package root tests.

pkg/analysis_server/test/context_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 'dart:collection';
 
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analyzer/file_system/file_system.dart';
@@ skipping 46 matching lines @@
   TestContextManagerCallbacks callbacks;
 
   MemoryResourceProvider resourceProvider;
 
   MockPackageMapProvider packageMapProvider;
 
   UriResolver packageResolver = null;
 
   String projPath = '/my/proj';
 
-  void fail_test_setRoots_addPackageRoot() {
-    // TODO(paulberry): failing due to dartbug.com/23909.
-    String packagePathFoo = '/package1/foo';
-    String packageRootPath = '/package2/foo';
-    Folder packageFolder = resourceProvider.newFolder(packagePathFoo);
-    packageMapProvider.packageMap = {'foo': [packageFolder]};
-    List<String> includedPaths = <String>[projPath];
-    List<String> excludedPaths = <String>[];
-    manager.setRoots(includedPaths, excludedPaths, <String, String>{});
-    _checkPackageMap(projPath, equals(packageMapProvider.packageMap));
-    manager.setRoots(includedPaths, excludedPaths, <String, String>{
-      projPath: packageRootPath
-    });
-    _checkPackageRoot(projPath, equals(packageRootPath));
-  }
-
-  void fail_test_setRoots_changePackageRoot() {
-    // TODO(paulberry): failing due to dartbug.com/23909.
-    String packageRootPath1 = '/package1';
-    String packageRootPath2 = '/package2';
-    List<String> includedPaths = <String>[projPath];
-    List<String> excludedPaths = <String>[];
-    manager.setRoots(includedPaths, excludedPaths, <String, String>{
-      projPath: packageRootPath1
-    });
-    _checkPackageRoot(projPath, equals(packageRootPath1));
-    manager.setRoots(includedPaths, excludedPaths, <String, String>{
-      projPath: packageRootPath2
-    });
-    _checkPackageRoot(projPath, equals(packageRootPath2));
-  }
-
-  void fail_test_setRoots_newFolderWithPackageRoot() {
-    // TODO(paulberry): failing due to dartbug.com/23909.
-    String packageRootPath = '/package';
-    manager.setRoots(<String>[projPath], <String>[], <String, String>{
-      projPath: packageRootPath
-    });
-    _checkPackageRoot(projPath, equals(packageRootPath));
-  }
-
-  void fail_test_setRoots_removePackageRoot() {
-    // TODO(paulberry): failing due to dartbug.com/23909.
-    String packagePathFoo = '/package1/foo';
-    String packageRootPath = '/package2/foo';
-    Folder packageFolder = resourceProvider.newFolder(packagePathFoo);
-    packageMapProvider.packageMap = {'foo': [packageFolder]};
-    List<String> includedPaths = <String>[projPath];
-    List<String> excludedPaths = <String>[];
-    manager.setRoots(includedPaths, excludedPaths, <String, String>{
-      projPath: packageRootPath
-    });
-    _checkPackageRoot(projPath, equals(packageRootPath));
-    manager.setRoots(includedPaths, excludedPaths, <String, String>{});
-    _checkPackageMap(projPath, equals(packageMapProvider.packageMap));
-  }
-
   String newFile(List<String> pathComponents, [String content = '']) {
     String filePath = posix.joinAll(pathComponents);
     resourceProvider.newFile(filePath, content);
     return filePath;
   }
 
   String newFolder(List<String> pathComponents) {
     String folderPath = posix.joinAll(pathComponents);
     resourceProvider.newFolder(folderPath);
     return folderPath;
@@ skipping 491 matching lines @@
     callbacks.assertContextFiles(subProjectA, [subProjectA_file]);
     callbacks.assertContextFiles(subProjectB, [subProjectB_file]);
     // verify package maps
     _checkPackageMap(root, isNull);
     _checkPackageMap(
         subProjectA, equals(packageMapProvider.packageMaps[subProjectA]));
     _checkPackageMap(
         subProjectB, equals(packageMapProvider.packageMaps[subProjectB]));
   }
 
+  void test_setRoots_addPackageRoot() {
+    String packagePathFoo = '/package1/foo';
+    String packageRootPath = '/package2/foo';
+    Folder packageFolder = resourceProvider.newFolder(packagePathFoo);
+    packageMapProvider.packageMap = {'foo': [packageFolder]};
+    List<String> includedPaths = <String>[projPath];
+    List<String> excludedPaths = <String>[];
+    manager.setRoots(includedPaths, excludedPaths, <String, String>{});
+    _checkPackageMap(projPath, equals(packageMapProvider.packageMap));
+    manager.setRoots(includedPaths, excludedPaths, <String, String>{
+      projPath: packageRootPath
+    });
+    _checkPackageRoot(projPath, equals(packageRootPath));
+  }
+
+  void test_setRoots_changePackageRoot() {
+    String packageRootPath1 = '/package1';
+    String packageRootPath2 = '/package2';
+    List<String> includedPaths = <String>[projPath];
+    List<String> excludedPaths = <String>[];
+    manager.setRoots(includedPaths, excludedPaths, <String, String>{
+      projPath: packageRootPath1
+    });
+    _checkPackageRoot(projPath, equals(packageRootPath1));
+    manager.setRoots(includedPaths, excludedPaths, <String, String>{
+      projPath: packageRootPath2
+    });
+    _checkPackageRoot(projPath, equals(packageRootPath2));
+  }
+
   void test_setRoots_exclude_newRoot_withExcludedFile() {
     // prepare paths
     String project = '/project';
     String file1 = '$project/file1.dart';
     String file2 = '$project/file2.dart';
     // create files
     resourceProvider.newFile(file1, '// 1');
     resourceProvider.newFile(file2, '// 2');
     // set roots
     manager.setRoots(<String>[project], <String>[file1], <String, String>{});
@@ skipping 104 matching lines @@
     // exclude "bbb/"
     manager.setRoots(<String>[project], <String>[folderB], <String, String>{});
     callbacks.assertContextPaths([project]);
     callbacks.assertContextFiles(project, [fileA]);
     // stop excluding "bbb/"
     manager.setRoots(<String>[project], <String>[], <String, String>{});
     callbacks.assertContextPaths([project]);
     callbacks.assertContextFiles(project, [fileA, fileB]);
   }
 
+  void test_setRoots_newFolderWithPackageRoot() {
+    String packageRootPath = '/package';
+    manager.setRoots(<String>[projPath], <String>[], <String, String>{
+      projPath: packageRootPath
+    });
+    _checkPackageRoot(projPath, equals(packageRootPath));
+  }
+
   void test_setRoots_newlyAddedFoldersGetProperPackageMap() {
     String packagePath = '/package/foo';
     Folder packageFolder = resourceProvider.newFolder(packagePath);
     packageMapProvider.packageMap = {'foo': [packageFolder]};
     manager.setRoots(<String>[projPath], <String>[], <String, String>{});
     _checkPackageMap(projPath, equals(packageMapProvider.packageMap));
   }
 
   void test_setRoots_packageResolver() {
     Uri uri = Uri.parse('package:foo/foo.dart');
@@ skipping 112 matching lines @@
     callbacks.assertContextFiles(projectB, [projectB_file]);
     callbacks.assertContextFiles(subProjectA, [subProjectA_file]);
     callbacks.assertContextFiles(subProjectB, [subProjectB_file]);
     // remove "projectB"
     manager.setRoots(<String>[projectA], <String>[], <String, String>{});
     callbacks.assertContextPaths([projectA, subProjectA]);
     callbacks.assertContextFiles(projectA, [projectA_file]);
     callbacks.assertContextFiles(subProjectA, [subProjectA_file]);
   }
 
+  void test_setRoots_removePackageRoot() {
+    String packagePathFoo = '/package1/foo';
+    String packageRootPath = '/package2/foo';
+    Folder packageFolder = resourceProvider.newFolder(packagePathFoo);
+    packageMapProvider.packageMap = {'foo': [packageFolder]};
+    List<String> includedPaths = <String>[projPath];
+    List<String> excludedPaths = <String>[];
+    manager.setRoots(includedPaths, excludedPaths, <String, String>{
+      projPath: packageRootPath
+    });
+    _checkPackageRoot(projPath, equals(packageRootPath));
+    manager.setRoots(includedPaths, excludedPaths, <String, String>{});
+    _checkPackageMap(projPath, equals(packageMapProvider.packageMap));
+  }
+
   test_watch_addDummyLink() {
     manager.setRoots(<String>[projPath], <String>[], <String, String>{});
     // empty folder initially
     Map<String, int> filePaths = callbacks.currentContextFilePaths[projPath];
     expect(filePaths, isEmpty);
     // add link
     String filePath = posix.join(projPath, 'foo.dart');
     resourceProvider.newDummyLink(filePath);
     // the link was ignored
     return pumpEventQueue().then((_) {
@@ skipping 512 matching lines @@
     Map<String, List<Folder>> packageMap =
         disposition is PackageMapDisposition ? disposition.packageMap : null;
     expect(packageMap, expectation);
   }
 
   /**
    * Verify that package URI's for source files in [path] will be resolved
    * using a package root maching [expectation].
    */
   void _checkPackageRoot(String path, expectation) {
-    // TODO(paulberry): this code needs to be reworked, since the context
-    // manager inspects the contents of the package root directory and converts
-    // it to a package map.  The only reason this code used to work was due to
-    // dartbug.com/23909.
-    fail('Cannot verify package root');
+    FolderDisposition disposition = callbacks.currentContextDispositions[path];
+    expect(disposition.packageRoot, expectation);
+    // TODO(paulberry): we should also verify that the package map itself is
+    // correct.  See dartbug.com/23909.
   }
 }
 
 class TestContextManagerCallbacks extends ContextManagerCallbacks {
   /**
    * Source of timestamps stored in [currentContextFilePaths].
    */
   int now = 0;
 
   /**
@@ skipping 129 matching lines @@
 class TestUriResolver extends UriResolver {
   Map<Uri, Source> uriMap;
 
   TestUriResolver(this.uriMap);
 
   @override
   Source resolveAbsolute(Uri uri, [Uri actualUri]) {
     return uriMap[uri];
   }
 }