Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Unified Diff: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/ScanTaskTest.java

Issue 10919160: Fix PackageLibraryManager set package directory (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/ScanTaskTest.java
===================================================================
--- editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/ScanTaskTest.java (revision 12059)
+++ editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/ScanTaskTest.java (working copy)
@@ -13,9 +13,13 @@
*/
package com.google.dart.tools.core.analysis;
+import com.google.common.collect.Lists;
+import com.google.dart.compiler.PackageLibraryManager;
import com.google.dart.engine.utilities.io.PrintStringWriter;
import com.google.dart.tools.core.AbstractDartCoreTest;
+import com.google.dart.tools.core.DartCore;
import com.google.dart.tools.core.analysis.ScanTask.DartFileType;
+import com.google.dart.tools.core.internal.model.PackageLibraryManagerProvider;
import com.google.dart.tools.core.test.util.FileUtilities;
import com.google.dart.tools.core.test.util.TestUtilities;
@@ -28,6 +32,7 @@
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
+import java.util.List;
public class ScanTaskTest extends AbstractDartCoreTest {
@@ -40,6 +45,8 @@
private static File simpleMoneySrcFile;
private static File bankDir;
private static File bankLibFile;
+ private static File packagesDir;
+ private static File pubspecFile;
private static File nestedAppFile;
private static File nestedLibFile;
@@ -60,6 +67,10 @@
TestUtilities.copyPluginRelativeContent("Bank", bankDir);
bankLibFile = new File(bankDir, "bank.dart");
assertTrue(bankLibFile.exists());
+ packagesDir = new File(bankDir, DartCore.PACKAGES_DIRECTORY_NAME);
+ assertTrue(packagesDir.exists());
+ pubspecFile = new File(bankDir, DartCore.PUBSPEC_FILE_NAME);
+ assertTrue(pubspecFile.exists());
nestedAppFile = new File(new File(bankDir, "nested"), "nestedApp.dart");
assertTrue(nestedAppFile.exists());
@@ -78,8 +89,33 @@
private AnalysisServerAdapter server;
private Listener listener;
+ public void test_packages_preference() throws Exception {
+ PackageLibraryManager libMgr = PackageLibraryManagerProvider.getAnyLibraryManager();
+ assertTrackedLibraryFiles(server);
+ server.assertAnalyzeContext(false);
+
+ List<File> packageRoots = Lists.newArrayList(packagesDir);
+ libMgr.setPackageRoots(packageRoots);
+ try {
+ server.scan(bankDir, null);
+ server.start();
+ listener.waitForIdle(1, FIVE_MINUTES_MS);
+ assertTrackedLibraryFiles(server, bankLibFile, nestedAppFile, nestedLibFile);
+ assertPackageContexts(server, bankDir);
+ server.assertAnalyzeContext(true);
+ } finally {
+ libMgr.setPackageRoots(null);
+ }
+ server.resetAnalyzeContext();
+ server.scan(bankDir, null);
+ listener.waitForIdle(2, FIVE_MINUTES_MS);
+ assertTrackedLibraryFiles(server, bankLibFile, nestedAppFile, nestedLibFile);
+ assertPackageContexts(server, bankDir);
+ }
+
public void test_scan_application() throws Exception {
assertTrackedLibraryFiles(server);
+ server.assertAnalyzeContext(false);
server.scan(bankDir, null);
server.start();
listener.waitForIdle(1, FIVE_MINUTES_MS);
« no previous file with comments | « editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/analysis/AnalyzeLibraryTaskTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698