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

more ModuleRootModel modifications rewritten using util methods

Browse Source
This commit is contained in:
nik
2012-06-25 16:00:18 +04:00
parent b865966a15
commit 5a5abd8495
4 changed files with 32 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/SrcRepositoryUseTest.java
+11 -29
View File
@@ -11,7 +11,7 @@ import com.intellij.openapi.roots.*;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileFilter;
import com.intellij.pom.java.LanguageLevel;
@@ -683,30 +683,8 @@ public class SrcRepositoryUseTest extends PsiTestCase{
psiFile.getText();
assertNotNull(aClass);
ApplicationManager.getApplication().runWriteAction(
new Runnable() {
@Override
public void run() {
VirtualFile newSourceRoot = psiFile.getVirtualFile().getParent();
final ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
final ContentEntry[] content = rootModel.getContentEntries();
boolean contentToChangeFound = false;
for (ContentEntry contentEntry : content) {
final SourceFolder[] sourceFolders = contentEntry.getSourceFolders();
for (SourceFolder sourceFolder : sourceFolders) {
contentEntry.removeSourceFolder(sourceFolder);
}
final VirtualFile contentRoot = contentEntry.getFile();
if (contentRoot != null && VfsUtil.isAncestor(contentRoot, newSourceRoot, false)) {
contentEntry.addSourceFolder(newSourceRoot, false);
contentToChangeFound = true;
}
}
assertTrue(contentToChangeFound);
rootModel.commit();
}
}
);
final VirtualFile newSourceRoot = psiFile.getVirtualFile().getParent();
replaceSourceRoot(newSourceRoot);
assertEquals("MyInterface1", aClass.getName());
}
@@ -715,11 +693,17 @@ public class SrcRepositoryUseTest extends PsiTestCase{
final PsiClass aClass = myJavaFacade.findClass("pack.MyInterface1", GlobalSearchScope.allScope(myProject));
assertNotNull(aClass);
final VirtualFile newSourceRoot = aClass.getContainingFile().getVirtualFile().getParent();
replaceSourceRoot(newSourceRoot);
assertEquals("MyInterface1", aClass.getName());
}
private void replaceSourceRoot(final VirtualFile newSourceRoot) {
ApplicationManager.getApplication().runWriteAction(
new Runnable() {
@Override
public void run() {
VirtualFile newSourceRoot = aClass.getContainingFile().getVirtualFile().getParent();
final ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
final ContentEntry[] content = rootModel.getContentEntries();
boolean contentToChangeFound = false;
@@ -729,7 +713,7 @@ public class SrcRepositoryUseTest extends PsiTestCase{
contentEntry.removeSourceFolder(sourceFolder);
}
final VirtualFile contentRoot = contentEntry.getFile();
if (contentRoot != null && VfsUtil.isAncestor(contentRoot, newSourceRoot, false)) {
if (contentRoot != null && VfsUtilCore.isAncestor(contentRoot, newSourceRoot, false)) {
contentEntry.addSourceFolder(newSourceRoot, false);
contentToChangeFound = true;
}
@@ -739,8 +723,6 @@ public class SrcRepositoryUseTest extends PsiTestCase{
}
}
);
assertEquals("MyInterface1", aClass.getName());
}
public void testParentIdAssert() throws Exception {
java/java-tests/testSrc/com/intellij/roots/ManagingContentRootsTest.java
+9 -13
View File
@@ -54,15 +54,7 @@ public class ManagingContentRootsTest extends IdeaTestCase {
final String url = root.getUrl();
root.delete(null);
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
ModifiableRootModel m = getRootManager().getModifiableModel();
m.addContentEntry(url);
m.commit();
}
});
addContentRoot(url);
assertNotNull(findContentEntry(url));
@@ -70,10 +62,7 @@ public class ManagingContentRootsTest extends IdeaTestCase {
assertSame(root, findContentEntry(url).getFile());
}
public void testCreationOfContentRootWithUrlWhenFileExists() throws IOException {
VirtualFile root = dir.createChildDirectory(null, "root");
final String url = root.getUrl();
private void addContentRoot(final String url) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
@@ -82,6 +71,13 @@ public class ManagingContentRootsTest extends IdeaTestCase {
m.commit();
}
});
}
public void testCreationOfContentRootWithUrlWhenFileExists() throws IOException {
VirtualFile root = dir.createChildDirectory(null, "root");
final String url = root.getUrl();
addContentRoot(url);
assertSame(root, findContentEntry(url).getFile());