Fix the imported package library move test.

pkg/analysis_server/test/services/refactoring/move_file_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.services.refactoring.move_files;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../../abstract_context.dart';
 import '../../utils.dart';
 import 'abstract_refactoring.dart';
 
 main() {
   initializeTestEnvironment();
   defineReflectiveTests(MoveFileTest);
 }
 
 @reflectiveTest
 class MoveFileTest extends RefactoringTest {
   MoveFileRefactoring refactoring;
 
-  /**
-   * TODO(scheglov) fix search of units
-   */
-  fail_file_importedLibrary_package() async {
-    // configure packages
-    testFile = '/packages/my_pkg/aaa/test.dart';
-    provider.newFile(testFile, '');
-    Map<String, List<Folder>> packageMap = {
-      'my_pkg': [provider.getResource('/packages/my_pkg')]
-    };
-    context.sourceFactory = new SourceFactory([
-      AbstractContextTest.SDK_RESOLVER,
-      new PackageMapUriResolver(provider, packageMap),
-      resourceResolver
-    ]);
-    // do testing
-    String pathA = '/project/bin/a.dart';
-    addSource(
-        pathA,
-        '''
-import 'package:my_pkg/aaa/test.dart';
-''');
-    addTestSource('');
-    _performAnalysis();
-    // perform refactoring
-    _createRefactoring('/packages/my_pkg/bbb/ccc/new_name.dart');
-    await _assertSuccessfulRefactoring();
-    assertFileChangeResult(
-        pathA,
-        '''
-import 'package:my_pkg/bbb/ccc/new_name.dart';
-''');
-    assertNoFileChange(testFile);
-  }
-
   test_file_definingUnit() async {
     String pathA = '/project/000/1111/a.dart';
     String pathB = '/project/000/1111/b.dart';
     String pathC = '/project/000/1111/22/c.dart';
     String pathD = '/project/000/1111/333/d.dart';
     testFile = '/project/000/1111/test.dart';
     addSource('/absolute/uri.dart', '');
     addSource(pathA, 'part of lib;');
     addSource(pathB, "import 'test.dart';");
     addSource(pathC, '');
@@ skipping 60 matching lines @@
     _createRefactoring('/project/000/1111/22/new_name.dart');
     await _assertSuccessfulRefactoring();
     assertFileChangeResult(
         pathA,
         '''
 import '22/new_name.dart';
 ''');
     assertNoFileChange(testFile);
   }
 
+  test_file_importedLibrary_package() async {
+    // configure packages
+    testFile = '/packages/my_pkg/lib/aaa/test.dart';
+    provider.newFile(testFile, '');
+    Map<String, List<Folder>> packageMap = {
+      'my_pkg': [provider.getResource('/packages/my_pkg/lib')]
+    };
+    context.sourceFactory = new SourceFactory([
+      AbstractContextTest.SDK_RESOLVER,
+      new PackageMapUriResolver(provider, packageMap),
+      resourceResolver
+    ]);
+    // do testing
+    String pathA = '/project/bin/a.dart';
+    addSource(
+        pathA,
+        '''
+import 'package:my_pkg/aaa/test.dart';
+''');
+    addTestSource('', Uri.parse('package:my_pkg/aaa/test.dart'));
+    _performAnalysis();
+    // perform refactoring
+    _createRefactoring('/packages/my_pkg/lib/bbb/ccc/new_name.dart');
+    await _assertSuccessfulRefactoring();
+    assertFileChangeResult(
+        pathA,
+        '''
+import 'package:my_pkg/bbb/ccc/new_name.dart';
+''');
+    assertNoFileChange(testFile);
+  }
+
   test_file_importedLibrary_up() async {
     String pathA = '/project/000/1111/a.dart';
     testFile = '/project/000/1111/22/test.dart';
     addSource(
         pathA,
         '''
 import '22/test.dart';
 ''');
     addTestSource('');
     _performAnalysis();
@@ skipping 139 matching lines @@
         break;
       }
       for (ChangeNotice notice in result.changeNotices) {
         if (notice.source.fullName.startsWith('/project/')) {
           index.indexUnit(notice.resolvedDartUnit);
         }
       }
     }
   }
 }