Update scan, changed and discard to handle "packages" and "pubspec.yaml"

editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java

Index: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java
===================================================================
--- editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java	(revision 11962)
+++ editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalysisServerTest.java	(working copy)
@@ -26,7 +26,6 @@
 import static com.google.dart.tools.core.analysis.AnalysisTestUtilities.assertTrackedLibraryFiles;
 import static com.google.dart.tools.core.analysis.AnalysisTestUtilities.getServerTaskQueue;
 import static com.google.dart.tools.core.analysis.AnalysisTestUtilities.getTrackedLibraryFiles;
-import static com.google.dart.tools.core.analysis.AnalysisTestUtilities.isLibraryCached;
 
 import junit.framework.TestCase;
 
@@ -72,7 +71,7 @@
     listener.assertNoDuplicates();
     listener.assertNoDiscards();
     assertTrackedLibraryFiles(server, libFile);
-    assertTrue(isLibraryResolved(libFile));
+    assertTrue(server.isLibraryResolved(libFile));
     return libFile;
   }
 
@@ -249,8 +248,8 @@
         waitForIdle();
 
         assertTrackedLibraryFiles(server, libFile);
-        assertTrue(isLibraryCached(server, libFile));
-        assertFalse(isLibraryResolved(libFile));
+        assertTrue(server.isLibraryCached(libFile));
+        assertFalse(server.isLibraryResolved(libFile));
         assertQueuedTasks(server);
       }
     });
@@ -284,7 +283,7 @@
         server.analyze(libFile);
         listener.waitForResolved(FIVE_MINUTES_MS, libFile);
         assertTrackedLibraryFiles(server, libFile);
-        assertTrue(isLibraryResolved(libFile));
+        assertTrue(server.isLibraryResolved(libFile));
 
         StringWriter writer = new StringWriter(5000);
         server.stop();
@@ -294,8 +293,8 @@
 
         assertQueuedTasks(server, "AnalyzeLibraryTask"); // dart:core
         assertTrackedLibraryFiles(server, libFile);
-        assertTrue(isLibraryCached(server, libFile));
-        assertFalse(isLibraryResolved(libFile));
+        assertTrue(server.isLibraryCached(libFile));
+        assertFalse(server.isLibraryResolved(libFile));
       }
     });
   }
@@ -371,13 +370,6 @@
     listener = new Listener(server);
   }
 
-  private boolean isLibraryResolved(File libFile) throws Exception {
-    Method method = server.getClass().getDeclaredMethod("isLibraryResolved", File.class);
-    method.setAccessible(true);
-    Object result = method.invoke(server, libFile);
-    return result instanceof Boolean && ((Boolean) result).booleanValue();
-  }
-
   private void readCache(Reader reeader) throws Exception {
     // server.readCache(cacheFile)
     Method method = server.getClass().getDeclaredMethod("readCache", Reader.class);