diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java index b7f840bd5b8c..d2825c17d558 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesManager.java @@ -22,6 +22,7 @@ import com.intellij.ide.projectView.impl.*; import com.intellij.ide.projectView.impl.nodes.LibraryGroupElement; import com.intellij.ide.projectView.impl.nodes.NamedLibraryElement; import com.intellij.ide.util.treeView.AbstractTreeNode; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.module.Module; @@ -374,21 +375,23 @@ public class FavoritesManager implements ProjectComponent, JDOMExternalizable { } public void projectOpened() { - StartupManager.getInstance(myProject).registerPostStartupActivity(new DumbAwareRunnable() { - public void run() { - final FavoritesListProvider[] providers = Extensions.getExtensions(EP_NAME, myProject); - for (FavoritesListProvider provider : providers) { - myProviders.put(provider.getListName(myProject), provider); - } - final MyRootsChangeAdapter myPsiTreeChangeAdapter = new MyRootsChangeAdapter(); + if (!ApplicationManager.getApplication().isUnitTestMode()) { + StartupManager.getInstance(myProject).registerPostStartupActivity(new DumbAwareRunnable() { + public void run() { + final FavoritesListProvider[] providers = Extensions.getExtensions(EP_NAME, myProject); + for (FavoritesListProvider provider : providers) { + myProviders.put(provider.getListName(myProject), provider); + } + final MyRootsChangeAdapter myPsiTreeChangeAdapter = new MyRootsChangeAdapter(); - PsiManager.getInstance(myProject).addPsiTreeChangeListener(myPsiTreeChangeAdapter, myProject); - if (myName2FavoritesRoots.isEmpty()) { - myDescriptions.put(myProject.getName(), "auto-added"); - createNewList(myProject.getName()); + PsiManager.getInstance(myProject).addPsiTreeChangeListener(myPsiTreeChangeAdapter, myProject); + if (myName2FavoritesRoots.isEmpty()) { + myDescriptions.put(myProject.getName(), "auto-added"); + createNewList(myProject.getName()); + } } - } - }); + }); + } } public void projectClosed() {