diff --git a/java/java-tests/testData/psi/repositoryUse/scr17094/classes/a/a/a/a/e/f/i.class b/java/java-tests/testData/psi/repositoryUse/deepPackages/classes/a/a/a/a/e/f/i.class similarity index 100% rename from java/java-tests/testData/psi/repositoryUse/scr17094/classes/a/a/a/a/e/f/i.class rename to java/java-tests/testData/psi/repositoryUse/deepPackages/classes/a/a/a/a/e/f/i.class diff --git a/java/java-tests/testData/psi/repositoryUse/scr17094/classes2/com/intellij/internal/a/b/a/i.class b/java/java-tests/testData/psi/repositoryUse/deepPackages/classes2/com/intellij/internal/a/b/a/i.class similarity index 100% rename from java/java-tests/testData/psi/repositoryUse/scr17094/classes2/com/intellij/internal/a/b/a/i.class rename to java/java-tests/testData/psi/repositoryUse/deepPackages/classes2/com/intellij/internal/a/b/a/i.class diff --git a/java/java-tests/testData/psi/repositoryUse/scr17094/classes1/com/intellij/util/d/bw.class b/java/java-tests/testData/psi/repositoryUse/scr17094/classes1/com/intellij/util/d/bw.class deleted file mode 100644 index 46b8238fc620..000000000000 Binary files a/java/java-tests/testData/psi/repositoryUse/scr17094/classes1/com/intellij/util/d/bw.class and /dev/null differ diff --git a/java/java-tests/testSrc/com/intellij/psi/SCR17094Test.java b/java/java-tests/testSrc/com/intellij/psi/FindClassInDeepPackagesTest.java similarity index 90% rename from java/java-tests/testSrc/com/intellij/psi/SCR17094Test.java rename to java/java-tests/testSrc/com/intellij/psi/FindClassInDeepPackagesTest.java index 501914bce501..5e5e010df2f7 100644 --- a/java/java-tests/testSrc/com/intellij/psi/SCR17094Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/FindClassInDeepPackagesTest.java @@ -29,9 +29,13 @@ import java.io.File; /** * @author dsl */ -public class SCR17094Test extends PsiTestCase { - protected void setUpClasses(final String s) throws Exception { - final String testRoot = PathManagerEx.getTestDataPath() + "/psi/repositoryUse/scr17094"; +public class FindClassInDeepPackagesTest extends PsiTestCase { + @Override + protected void setUpJdk() { + } + + private void setUpLibrary(final String s) throws Exception { + final String testRoot = PathManagerEx.getTestDataPath() + "/psi/repositoryUse/deepPackages"; VirtualFile classesRoot = WriteCommandAction.runWriteCommandAction(null, new Computable() { @Override public VirtualFile compute() { @@ -44,20 +48,15 @@ public class SCR17094Test extends PsiTestCase { ModuleRootModificationUtil.addModuleLibrary(myModule, classesRoot.getUrl()); } - @Override - protected void setUpJdk() { - - } - public void testSRC() throws Exception { - setUpClasses("classes"); + setUpLibrary("classes"); final JavaPsiFacade psiManager = getJavaFacade(); final PsiClass classA = psiManager.findClass("a.a.a.a.e.f.i", GlobalSearchScope.moduleWithLibrariesScope(myModule)); assertNotNull(classA); } public void test3() throws Exception { - setUpClasses("classes2"); + setUpLibrary("classes2"); final JavaPsiFacade psiManager = getJavaFacade(); final PsiClass classA = psiManager.findClass("com.intellij.internal.f.a.b.a.i", GlobalSearchScope.moduleWithLibrariesScope(myModule)); assertNotNull(classA); diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR17650Test.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java similarity index 84% rename from java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR17650Test.java rename to java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java index 187d0c2ad80e..5311bd15dfec 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR17650Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/ClassFileUnderSourceRootTest.java @@ -3,7 +3,6 @@ package com.intellij.psi.impl.cache.impl; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.roots.ModuleRootModificationUtil; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VfsUtilCore; @@ -17,20 +16,15 @@ import java.io.IOException; /** * @author max */ -public class SCR17650Test extends PsiTestCase { +public class ClassFileUnderSourceRootTest extends PsiTestCase { private static final String TEST_ROOT = PathManagerEx.getTestDataPath() + "/psi/repositoryUse/cls"; - private VirtualFile myDir; @Override protected void setUp() throws Exception { super.setUp(); - final File root = FileUtil.createTempFile(getName(), ""); - root.delete(); - root.mkdir(); - myFilesToDelete.add(root); - + final File root = createTempDirectory(); ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { @@ -55,11 +49,10 @@ public class SCR17650Test extends PsiTestCase { private static VirtualFile getClassFile() { VirtualFile vDir = LocalFileSystem.getInstance().findFileByPath(TEST_ROOT.replace(File.separatorChar, '/')); - VirtualFile child = vDir.findChild("pack").findChild("MyClass.class"); - return child; + return vDir.findFileByRelativePath("pack/MyClass.class"); } - public void test17650() throws Exception { + public void testFindClass() throws Exception { assertEquals("p.A", myJavaFacade.findClass("p.A").getQualifiedName()); assertEquals("pack.MyClass", myJavaFacade.findClass("pack.MyClass").getQualifiedName()); } diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java similarity index 92% rename from java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java rename to java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java index be7ef88c2001..e88027409dc0 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java @@ -23,7 +23,6 @@ import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootModificationUtil; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -38,7 +37,7 @@ import java.io.IOException; /** * @author max */ -public class SCR14423Test extends PsiTestCase { +public class FindClassTest extends PsiTestCase { private VirtualFile myPrjDir1; private VirtualFile mySrcDir1; private VirtualFile myPackDir; @@ -47,11 +46,7 @@ public class SCR14423Test extends PsiTestCase { protected void setUp() throws Exception { super.setUp(); - final File root = FileUtil.createTempFile(getName(), ""); - root.delete(); - root.mkdir(); - myFilesToDelete.add(root); - + final File root = createTempDirectory(); WriteCommandAction.runWriteCommandAction(null, new Runnable() { @Override public void run() { @@ -76,14 +71,12 @@ public class SCR14423Test extends PsiTestCase { }); } - public void testBug2() throws Exception { + public void testSimple() throws Exception { PsiClass psiClass = myJavaFacade.findClass("p.A"); assertEquals("p.A", psiClass.getQualifiedName()); - - testBug1(); } - public void testBug1() { + public void testClassUnderExcludedFolder() { ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { PsiTestUtil.addExcludedRoot(myModule, myPackDir); @@ -102,7 +95,7 @@ public class SCR14423Test extends PsiTestCase { }); } - public void testBug3() { + public void testClassUnderIgnoredFolder() { ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { PsiClass psiClass = myJavaFacade.findClass("p.A", GlobalSearchScope.allScope(myProject)); @@ -126,7 +119,7 @@ public class SCR14423Test extends PsiTestCase { }); } - public void testSyncrhonizationAfterChange() { + public void testSynchronizationAfterChange() { ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { FileDocumentManager.getInstance().saveAllDocuments(); diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR20733Test.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SameSourceRootInTwoModulesTest.java similarity index 91% rename from java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR20733Test.java rename to java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SameSourceRootInTwoModulesTest.java index 5fef7daea7d9..1a5d5faeca7c 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR20733Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SameSourceRootInTwoModulesTest.java @@ -3,7 +3,6 @@ package com.intellij.psi.impl.cache.impl; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -18,7 +17,7 @@ import java.io.IOException; /** * @author max */ -public class SCR20733Test extends PsiTestCase { +public class SameSourceRootInTwoModulesTest extends PsiTestCase { private VirtualFile myPrjDir1; private VirtualFile mySrcDir1; private VirtualFile myPackDir; @@ -27,11 +26,7 @@ public class SCR20733Test extends PsiTestCase { protected void setUp() throws Exception { super.setUp(); - final File root = FileUtil.createTempFile(getName(), ""); - root.delete(); - root.mkdir(); - myFilesToDelete.add(root); - + final File root = createTempDirectory(); ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR19174Test.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SourceRootAddedAsLibraryRootTest.java similarity index 77% rename from java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR19174Test.java rename to java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SourceRootAddedAsLibraryRootTest.java index c47bbf7184e8..36baf5de0d76 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR19174Test.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SourceRootAddedAsLibraryRootTest.java @@ -2,7 +2,6 @@ package com.intellij.psi.impl.cache.impl; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.roots.ModuleRootModificationUtil; -import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -16,7 +15,7 @@ import java.io.IOException; /** * @author max */ -public class SCR19174Test extends PsiTestCase { +public class SourceRootAddedAsLibraryRootTest extends PsiTestCase { private VirtualFile myDir; private VirtualFile myVFile; @@ -24,11 +23,7 @@ public class SCR19174Test extends PsiTestCase { protected void setUp() throws Exception { super.setUp(); - final File root = FileUtil.createTempFile(getName(), ""); - root.delete(); - root.mkdir(); - myFilesToDelete.add(root); - + final File root = createTempDirectory(); ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { @@ -37,12 +32,6 @@ public class SCR19174Test extends PsiTestCase { myDir = rootVFile.createChildDirectory(null, "contentAndLibrary"); - /* - myVFile = myDir.createChildData(null, "A.java"); - Writer writer1 = myVFile.getWriter(null); - writer1.write("package p; public class A{ public void foo(); }"); - writer1.close(); - */ PsiTestUtil.addSourceRoot(myModule, myDir); } catch (IOException e) {