more tests -> community

diff --git a/java/java-tests/testData/psi/impl/cache/1.java b/java/java-tests/testData/psi/impl/cache/1.java
new file mode 100644 (file)
index 0000000..3d70858
--- /dev/null
+++ b/java/java-tests/testData/psi/impl/cache/1.java
@@ -0,0 +1 @@
+a b c //todo
\ No newline at end of file

diff --git a/java/java-tests/testData/psi/impl/cache/2.java b/java/java-tests/testData/psi/impl/cache/2.java
new file mode 100644 (file)
index 0000000..dd04a83
--- /dev/null
+++ b/java/java-tests/testData/psi/impl/cache/2.java
@@ -0,0 +1,2 @@
+b c d
+//newtodo
\ No newline at end of file

diff --git a/java/java-tests/testData/psi/impl/cache/3.java b/java/java-tests/testData/psi/impl/cache/3.java
new file mode 100644 (file)
index 0000000..a033be3
--- /dev/null
+++ b/java/java-tests/testData/psi/impl/cache/3.java
@@ -0,0 +1,3 @@
+c d e
+//todo
+//todo
\ No newline at end of file

diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java
new file mode 100644 (file)
index 0000000..5ec392f
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/IdCacheTest.java
@@ -0,0 +1,248 @@
+package com.intellij.psi.impl.cache.impl;
+
+import com.intellij.JavaTestUtil;
+import com.intellij.codeInsight.CodeInsightTestCase;
+import com.intellij.ide.todo.TodoConfiguration;
+import com.intellij.ide.todo.TodoIndexPatternProvider;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.impl.cache.CacheManager;
+import com.intellij.psi.impl.cache.impl.id.IdIndex;
+import com.intellij.psi.impl.cache.impl.todo.TodoIndex;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.TodoAttributes;
+import com.intellij.psi.search.TodoPattern;
+import com.intellij.psi.search.UsageSearchContext;
+import com.intellij.testFramework.PsiTestUtil;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.indexing.FileBasedIndex;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Comparator;
+
+public class IdCacheTest extends CodeInsightTestCase{
+
+  private VirtualFile myRootDir;
+  private File myCacheFile;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    final FileBasedIndex fileBasedIndex = FileBasedIndex.getInstance();
+    fileBasedIndex.requestRebuild(IdIndex.NAME);
+    fileBasedIndex.requestRebuild(TodoIndex.NAME);
+
+    String root = JavaTestUtil.getJavaTestDataPath()+ "/psi/impl/cache/";
+
+    PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17());
+    myRootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete);
+
+    myCacheFile = FileUtil.createTempFile("cache", "");
+    myCacheFile.delete();
+    myFilesToDelete.add(myCacheFile);
+  }
+
+  public void testBuildCache() throws Exception {
+    checkCache(CacheManager.SERVICE.getInstance(myProject));
+  }
+
+  public void testLoadCacheNoTodo() throws Exception {
+
+    final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+
+    checkResult(new String[]{"1.java", "2.java"}, convert(cache.getFilesWithWord("b", UsageSearchContext.ANY, GlobalSearchScope.projectScope(myProject), false)));
+  }
+
+  public void testUpdateCache1() throws Exception {
+    myRootDir.createChildData(null, "4.java");
+    Thread.sleep(1000);
+    checkCache(CacheManager.SERVICE.getInstance(myProject));
+  }
+
+  public void testUpdateCache2() throws Exception {
+    VirtualFile child = myRootDir.findChild("1.java");
+    VfsUtil.saveText(child, "xxx");
+
+    PsiDocumentManager.getInstance(myProject).commitAllDocuments();
+    FileDocumentManager.getInstance().saveAllDocuments();
+
+    final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+    final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject);
+    checkResult(new String[] {"1.java"}, convert(cache.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{}, convert(cache.getFilesWithWord("a", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java"}, convert(cache.getFilesWithWord("b", UsageSearchContext.ANY,scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("c", UsageSearchContext.ANY,scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY,scope, false)));
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY,scope, false)));
+
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithTodoItems()));
+    assertEquals(0, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance()));
+  }
+
+  public void testUpdateCache3() throws Exception {
+    VirtualFile child = myRootDir.findChild("1.java");
+    child.delete(null);
+
+    final CacheManager cache2 = CacheManager.SERVICE.getInstance(myProject);
+    final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject);
+    checkResult(ArrayUtil.EMPTY_STRING_ARRAY, convert(cache2.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false)));
+    checkResult(ArrayUtil.EMPTY_STRING_ARRAY, convert(cache2.getFilesWithWord("a", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java"}, convert(cache2.getFilesWithWord("b", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache2.getFilesWithWord("c", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache2.getFilesWithWord("d", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"3.java"}, convert(cache2.getFilesWithWord("e", UsageSearchContext.ANY, scope, false)));
+
+    checkResult(new String[]{"3.java"}, convert(cache2.getFilesWithTodoItems()));
+    assertEquals(0, cache2.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(2, cache2.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance()));
+  }
+
+  public void testUpdateCacheNoTodo() throws Exception {
+    myRootDir.createChildData(null, "4.java");
+    final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject);
+    final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+    checkResult(new String[]{"1.java", "2.java"}, convert(cache.getFilesWithWord("b", UsageSearchContext.ANY, scope, false)));
+  }
+
+  public void testUpdateOnTodoChange() throws Exception {
+    TodoPattern pattern = new TodoPattern("newtodo", TodoAttributes.createDefault(), true);
+    TodoPattern[] oldPatterns = TodoConfiguration.getInstance().getTodoPatterns();
+    TodoConfiguration.getInstance().setTodoPatterns(new TodoPattern[]{pattern});
+
+    try{
+      final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+      checkResult(new String[]{"2.java"}, convert(cache.getFilesWithTodoItems()));
+      assertEquals(0, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance()));
+      assertEquals(1, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance()));
+      assertEquals(0, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance()));
+    }
+    finally{
+      TodoConfiguration.getInstance().setTodoPatterns(oldPatterns);
+    }
+  }
+
+  public void testFileModification() throws Exception {
+    final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+    checkCache(cache);
+
+    VirtualFile child = myRootDir.findChild("1.java");
+
+    checkCache(cache);
+
+    VfsUtil.saveText(child, "xxx");
+    PsiDocumentManager.getInstance(myProject).commitAllDocuments();
+
+    final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject);
+    checkResult(new String[] {"1.java"}, convert(cache.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{}, convert(cache.getFilesWithWord("a", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java"}, convert(cache.getFilesWithWord("b", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("c", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false)));
+
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithTodoItems()));
+    assertEquals(0, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance()));
+  }
+
+  public void testFileDeletion() throws Exception {
+    final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+    checkCache(cache);
+
+    VirtualFile child = myRootDir.findChild("1.java");
+    child.delete(null);
+
+    final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject);
+    checkResult(new String[]{}, convert(cache.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{}, convert(cache.getFilesWithWord("a", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java"}, convert(cache.getFilesWithWord("b", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("c", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false)));
+
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithTodoItems()));
+    assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance()));
+  }
+
+  public void testFileCreation() throws Exception {
+    final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+    checkCache(cache);
+
+    VirtualFile child = myRootDir.createChildData(null, "4.java");
+    VfsUtil.saveText(child, "xxx //todo");
+    PsiDocumentManager.getInstance(myProject).commitAllDocuments();
+
+    final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject);
+    checkResult(new String[]{"4.java"}, convert(cache.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"1.java"}, convert(cache.getFilesWithWord("a", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"1.java", "2.java"}, convert(cache.getFilesWithWord("b", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"1.java", "2.java", "3.java"}, convert(cache.getFilesWithWord("c", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false)));
+
+    checkResult(new String[]{"1.java", "3.java", "4.java"}, convert(cache.getFilesWithTodoItems()));
+    assertEquals(1, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(1, cache.getTodoCount(myRootDir.findChild("4.java"), TodoIndexPatternProvider.getInstance()));
+  }
+
+  public void testCrash() throws Exception {
+    final CacheManager cache = CacheManager.SERVICE.getInstance(myProject);
+    cache.getFilesWithWord("xxx", UsageSearchContext.ANY, GlobalSearchScope.projectScope(myProject), false);
+    System.gc();
+  }
+
+  private void checkCache(CacheManager cache) {
+    final GlobalSearchScope scope = GlobalSearchScope.projectScope(myProject);
+    checkResult(ArrayUtil.EMPTY_STRING_ARRAY, convert(cache.getFilesWithWord("xxx", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"1.java"}, convert(cache.getFilesWithWord("a", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"1.java", "2.java"}, convert(cache.getFilesWithWord("b", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"1.java", "2.java", "3.java"}, convert(cache.getFilesWithWord("c", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"2.java", "3.java"}, convert(cache.getFilesWithWord("d", UsageSearchContext.ANY, scope, false)));
+    checkResult(new String[]{"3.java"}, convert(cache.getFilesWithWord("e", UsageSearchContext.ANY, scope, false)));
+
+    checkResult(new String[]{"1.java", "3.java"}, convert(cache.getFilesWithTodoItems()));
+    assertEquals(1, cache.getTodoCount(myRootDir.findChild("1.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(0, cache.getTodoCount(myRootDir.findChild("2.java"), TodoIndexPatternProvider.getInstance()));
+    assertEquals(2, cache.getTodoCount(myRootDir.findChild("3.java"), TodoIndexPatternProvider.getInstance()));
+  }
+
+  private static VirtualFile[] convert(PsiFile[] psiFiles) {
+    final VirtualFile[] files = new VirtualFile[psiFiles.length];
+    for (int idx = 0; idx < psiFiles.length; idx++) {
+      files[idx] = psiFiles[idx].getVirtualFile();
+    }
+    return files;
+  }
+  
+  private static void checkResult(String[] expected, VirtualFile[] result){
+    assertEquals(expected.length, result.length);
+    
+    Arrays.sort(expected);
+    Arrays.sort(result, new Comparator() {
+      @Override
+      public int compare(Object o1, Object o2) {
+        VirtualFile file1 = (VirtualFile)o1;
+        VirtualFile file2 = (VirtualFile)o2;
+        return file1.getName().compareTo(file2.getName());
+      }
+    });
+
+    for(int i = 0; i < expected.length; i++){
+      String name = expected[i];
+      assertEquals(name, result[i].getName());
+    }
+  }
+}

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/SCR14423Test.java
new file mode 100644 (file)
index 0000000..63d301a
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR14423Test.java
@@ -0,0 +1,133 @@
+package com.intellij.psi.impl.cache.impl;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.roots.ContentEntry;
+import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.openapi.roots.ModuleRootManager;
+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;
+import com.intellij.psi.PsiClass;
+import com.intellij.testFramework.PsiTestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author max
+ */
+public class SCR14423Test extends PsiTestCase {
+  private VirtualFile myPrjDir1;
+  private VirtualFile mySrcDir1;
+  private VirtualFile myPackDir;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    final File root = FileUtil.createTempFile(getName(), "");
+    root.delete();
+    root.mkdir();
+    myFilesToDelete.add(root);
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          VirtualFile rootVFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
+
+          myPrjDir1 = rootVFile.createChildDirectory(null, "prj1");
+          mySrcDir1 = myPrjDir1.createChildDirectory(null, "src1");
+
+          myPackDir = mySrcDir1.createChildDirectory(null, "p");
+          VirtualFile file1 = myPackDir.createChildData(null, "A.java");
+          VfsUtil.saveText(file1, "package p; public class A{ public void foo(); }");
+
+          final ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+          final ContentEntry contentEntry1 = rootModel.addContentEntry(myPrjDir1);
+          contentEntry1.addSourceFolder(mySrcDir1, false);
+          rootModel.commit();
+        }
+        catch (IOException e) {
+          LOG.error(e);
+        }
+      }
+    });
+  }
+
+  public void testBug2() throws Exception {
+    PsiClass psiClass = myJavaFacade.findClass("p.A");
+    assertEquals("p.A", psiClass.getQualifiedName());
+
+    testBug1();
+  }
+
+  public void testBug1() {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+        rootModel.getContentEntries()[0].addExcludeFolder(myPackDir);
+        rootModel.commit();
+
+        PsiClass psiClass = myJavaFacade.findClass("p.A");
+        assertNull(psiClass);
+
+        rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+        final ContentEntry content = rootModel.getContentEntries()[0];
+        content.removeExcludeFolder(content.getExcludeFolders()[0]);
+        rootModel.commit();
+
+        psiClass = myJavaFacade.findClass("p.A");
+        assertEquals("p.A", psiClass.getQualifiedName());
+      }
+    });
+  }
+
+  public void testBug3() {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        PsiClass psiClass = myJavaFacade.findClass("p.A");
+        assertEquals("p.A", psiClass.getQualifiedName());
+
+        assertTrue(psiClass.isValid());
+
+        ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+        rootModel.getContentEntries()[0].addExcludeFolder(myPackDir);
+        rootModel.commit();
+
+        assertFalse(psiClass.isValid());
+
+        rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+        final ContentEntry content = rootModel.getContentEntries()[0];
+        content.removeExcludeFolder(content.getExcludeFolders()[0]);
+        rootModel.commit();
+
+        psiClass = myJavaFacade.findClass("p.A");
+        assertTrue(psiClass.isValid());
+      }
+    });
+  }
+
+  public void testSyncrhonizationAfterChange() {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        FileDocumentManager.getInstance().saveAllDocuments();
+        PsiClass psiClass = myJavaFacade.findClass("p.A");
+        final VirtualFile vFile = psiClass.getContainingFile().getVirtualFile();
+        File ioFile = VfsUtil.virtualToIoFile(vFile);
+        ioFile.setLastModified(5);
+
+        LocalFileSystem.getInstance().refresh(false);
+
+        ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+        rootModel.setSdk(null);
+        rootModel.commit();
+
+        psiClass = myJavaFacade.findClass("p.A");
+        assertNotNull(psiClass);
+      }
+    });
+  }
+}

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/SCR19174Test.java
new file mode 100644 (file)
index 0000000..d7481bb
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR19174Test.java
@@ -0,0 +1,87 @@
+package com.intellij.psi.impl.cache.impl;
+
+import com.intellij.openapi.application.ApplicationManager;
+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.roots.libraries.Library;
+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;
+import com.intellij.psi.PsiFile;
+import com.intellij.testFramework.PsiTestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author max
+ */
+public class SCR19174Test extends PsiTestCase {
+  private VirtualFile myDir;
+  private VirtualFile myVFile;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    final File root = FileUtil.createTempFile(getName(), "");
+    root.delete();
+    root.mkdir();
+    myFilesToDelete.add(root);
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          VirtualFile rootVFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
+
+          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();
+          */
+
+          final ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+          final ContentEntry contentEntry1 = rootModel.addContentEntry(myDir);
+          contentEntry1.addSourceFolder(myDir, false);
+          rootModel.commit();
+        }
+        catch (IOException e) {
+          LOG.error(e);
+        }
+      }
+    });
+  }
+
+  private void changeRoots() {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        final ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+
+        final Library jarLibrary = rootModel.getModuleLibraryTable().createLibrary();
+        final Library.ModifiableModel libraryModel = jarLibrary.getModifiableModel();
+        libraryModel.addRoot(myDir, OrderRootType.CLASSES);
+        libraryModel.commit();
+        rootModel.commit();
+      }
+    });
+  }
+
+  public void testBug() throws Exception {
+    touchFileSync();
+    PsiFile psiFile = myPsiManager.findFile(myVFile);
+    psiFile.getText();
+    changeRoots();
+  }
+
+  private void touchFileSync() throws IOException {
+    myVFile = myDir.createChildData(null, "A.java");
+    VfsUtil.saveText(myVFile, "package p; public class A{ public void foo(); }");
+  }
+}

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/SCR20733Test.java
new file mode 100644 (file)
index 0000000..8c77961
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SCR20733Test.java
@@ -0,0 +1,86 @@
+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.roots.ContentEntry;
+import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.openapi.roots.ModuleRootManager;
+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;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiFile;
+import com.intellij.testFramework.PsiTestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * @author max
+ */
+public class SCR20733Test extends PsiTestCase {
+  private VirtualFile myPrjDir1;
+  private VirtualFile mySrcDir1;
+  private VirtualFile myPackDir;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    final File root = FileUtil.createTempFile(getName(), "");
+    root.delete();
+    root.mkdir();
+    myFilesToDelete.add(root);
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          VirtualFile rootVFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
+
+          myPrjDir1 = rootVFile.createChildDirectory(null, "prj1");
+          mySrcDir1 = myPrjDir1.createChildDirectory(null, "src1");
+
+          myPackDir = mySrcDir1.createChildDirectory(null, "p");
+          VirtualFile file1 = myPackDir.createChildData(null, "A.java");
+          VfsUtil.saveText(file1, "package p; public class A{ public void foo(); }");
+
+          final ModifiableRootModel rootModel = ModuleRootManager.getInstance(myModule).getModifiableModel();
+          final ContentEntry contentEntry1 = rootModel.addContentEntry(myPrjDir1);
+          contentEntry1.addSourceFolder(mySrcDir1, false);
+          rootModel.commit();
+        }
+        catch (IOException e) {
+          LOG.error(e);
+        }
+      }
+    });
+  }
+
+  public void testBug() {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        PsiClass psiClass = myJavaFacade.findClass("p.A");
+        assertEquals("p.A", psiClass.getQualifiedName());
+
+        final PsiFile psiFile = myPsiManager.findFile(myPackDir.findChild("A.java"));
+        psiFile.getChildren();
+        assertEquals(psiFile, psiClass.getContainingFile());
+
+        VirtualFile file = psiFile.getVirtualFile();
+        assertEquals(myModule, ModuleUtil.findModuleForFile(file, myProject));
+
+        Module anotherModule = createModule("another");
+        myFilesToDelete.add(new File(anotherModule.getModuleFilePath()));
+
+        ModifiableRootModel rootModel = ModuleRootManager.getInstance(anotherModule).getModifiableModel();
+        rootModel.addContentEntry(mySrcDir1).addSourceFolder(mySrcDir1, false);
+        rootModel.commit();
+
+        assertEquals(anotherModule, ModuleUtil.findModuleForFile(file, myProject));
+      }
+    });
+  }
+}