From 617cc47aef57b409f6d92fce84e30922dd2e6e42 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 21 May 2012 12:17:59 +0400 Subject: [PATCH] used methods from PsiTestUtil in tests --- .../daemon/quickFix/OrderEntryTest.java | 9 +------- .../psi/resolve/ResolveClassTest.java | 16 +++++--------- .../intellij/roots/ExportingModulesTest.java | 5 ++--- .../dom/AndroidLibraryProjectTest.java | 22 +++---------------- .../importing/DependenciesImportingTest.java | 10 ++------- 5 files changed, 13 insertions(+), 49 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java index fdcaa3a50cf8..d77be017306f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java @@ -101,14 +101,7 @@ public class OrderEntryTest extends DaemonAnalyzerTestCase { public void testAddCircularDependency() throws Exception { final Module a = ModuleManager.getInstance(getProject()).findModuleByName("A"); final Module b = ModuleManager.getInstance(getProject()).findModuleByName("B"); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - ModifiableRootModel model = ModuleRootManager.getInstance(a).getModifiableModel(); - model.addModuleOrderEntry(b); - model.commit(); - } - }); + PsiTestUtil.addDependency(a, b); try { doTest("B/src/y/AddDependency.java"); diff --git a/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveClassTest.java b/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveClassTest.java index b7cd434142e2..b3c851d11fb1 100644 --- a/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveClassTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/resolve/ResolveClassTest.java @@ -20,14 +20,12 @@ import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.StdModuleTypes; -import com.intellij.openapi.roots.ContentEntry; -import com.intellij.openapi.roots.ModifiableRootModel; -import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.testFramework.PlatformTestUtil; +import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.ResolveTestCase; public class ResolveClassTest extends ResolveTestCase { @@ -215,18 +213,14 @@ public class ResolveClassTest extends ResolveTestCase { Module module = modifiableModel.newModule("a.iml", StdModuleTypes.JAVA.getId()); modifiableModel.commit(); - ModifiableRootModel rootModel = ModuleRootManager.getInstance(module).getModifiableModel(); VirtualFile root = LocalFileSystem.getInstance().refreshAndFindFileByPath(getTestDataPath() + "/class/dependentModule"); assert root != null; - ContentEntry contentEntry = rootModel.addContentEntry(root); - contentEntry.addSourceFolder(root.findChild("src"), false); - contentEntry.addSourceFolder(root.findChild("test"), true); - rootModel.commit(); + PsiTestUtil.addContentRoot(module, root); + PsiTestUtil.addSourceRoot(module, root.findChild("src")); + PsiTestUtil.addSourceRoot(module, root.findChild("test"), true); - ModifiableRootModel modifiableRootModel = ModuleRootManager.getInstance(getModule()).getModifiableModel(); - modifiableRootModel.addModuleOrderEntry(module); - modifiableRootModel.commit(); + PsiTestUtil.addDependency(getModule(), module); } }); } diff --git a/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java b/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java index 7406ee69cc55..8a2673e97c48 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java @@ -31,6 +31,7 @@ import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.PsiTestUtil; import java.io.File; @@ -61,9 +62,7 @@ public class ExportingModulesTest extends IdeaTestCase { moduleBAentry.setExported(true); rootModelB.commit(); - final ModifiableRootModel rootModelC = ModuleRootManager.getInstance(moduleC).getModifiableModel(); - rootModelC.addModuleOrderEntry(moduleB); - rootModelC.commit(); + PsiTestUtil.addDependency(moduleC, moduleB); final PsiClass pCClass = JavaPsiFacade.getInstance(myProject).findClass("p.C", GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(moduleC)); diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java index 50b9e37c84c4..ce72c2f2ead3 100644 --- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java +++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java @@ -5,12 +5,11 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; -import com.intellij.openapi.roots.ModifiableRootModel; -import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.testFramework.IdeaTestCase; +import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; import com.intellij.testFramework.fixtures.*; @@ -82,23 +81,8 @@ public class AndroidLibraryProjectTest extends UsefulTestCase { myLibFacet = AndroidTestCase.addAndroidFacet(myLibModule, getTestSdkPath()); myLibFacet.getConfiguration().LIBRARY_PROJECT = true; - final ModifiableRootModel model1 = ModuleRootManager.getInstance(myAppModule).getModifiableModel(); - model1.addModuleOrderEntry(myLibModule); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - model1.commit(); - } - }); - - final ModifiableRootModel model2 = ModuleRootManager.getInstance(myLibModule).getModifiableModel(); - model2.addModuleOrderEntry(myLibGenModule); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - @Override - public void run() { - model2.commit(); - } - }); + PsiTestUtil.addDependency(myAppModule, myLibModule); + PsiTestUtil.addDependency(myLibModule, myLibGenModule); } private void createInitialStructure() { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java index 1b3dcaa57fee..de2dce2defd0 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java @@ -26,6 +26,7 @@ import com.intellij.openapi.roots.libraries.LibraryTable; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.testFramework.PsiTestUtil; import org.jetbrains.idea.maven.MavenCustomRepositoryHelper; import org.jetbrains.idea.maven.MavenImportingTestCase; import org.jetbrains.idea.maven.model.MavenId; @@ -1506,14 +1507,7 @@ public class DependenciesImportingTest extends MavenImportingTestCase { final Module module = createModule("my-module"); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - ModifiableRootModel model = ModuleRootManager.getInstance(getModule("m1")).getModifiableModel(); - model.addModuleOrderEntry(module); - model.commit(); - } - }); - + PsiTestUtil.addDependency(getModule("m1"), module); assertModuleModuleDeps("m1", "m2", "my-module");