MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

used methods from PsiTestUtil in tests

Browse Source
This commit is contained in:
nik
2012-05-21 12:18:21 +04:00
parent c96f95f441
commit 617cc47aef
5 changed files with 13 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java
+1 -8
View File
@@ -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");
java/java-tests/testSrc/com/intellij/psi/resolve/ResolveClassTest.java
+5 -11
View File
@@ -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);
}
});
}
java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java
+2 -3
View File
@@ -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));
plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java
+3 -19
View File
@@ -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() {
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/DependenciesImportingTest.java
+2 -8
View File
@@ -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");