projectview tests fixed

java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewLibrariesNode.java

@@ -41,7 +41,10 @@ public class PackageViewLibrariesNode extends ProjectViewNode<LibrariesElement>{
   }
 
   public boolean contains(@NotNull final VirtualFile file) {
-    return someChildContainsFile(file);
+    ProjectFileIndex index = ProjectRootManager.getInstance(getProject()).getFileIndex();
+    if (!index.isInLibrarySource(file) && !index.isInLibraryClasses(file)) return false;
+
+    return someChildContainsFile(file, false);
   }
 
   @NotNull

platform/lang-api/src/com/intellij/ide/projectView/ProjectViewNode.java

@@ -130,11 +130,10 @@ public abstract class ProjectViewNode <Value> extends AbstractTreeNode<Value> im
 
   public boolean someChildContainsFile(final VirtualFile file, boolean optimizeByCheckingFileRootsFirst) {
     VirtualFile parent = file.getParent();
-    if (parent == null) return false;
 
     boolean mayContain = false;
 
-    if (optimizeByCheckingFileRootsFirst) {
+    if (optimizeByCheckingFileRootsFirst && parent != null) {
       Collection<VirtualFile> roots = getRoots();
       for (VirtualFile eachRoot : roots) {
         if (parent.equals(eachRoot.getParent())) {

platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ModuleGroupNode.java

@@ -83,7 +83,7 @@ public abstract class ModuleGroupNode extends ProjectViewNode<ModuleGroup> imple
   }
 
   public boolean contains(@NotNull VirtualFile file) {
-    return someChildContainsFile(file);
+    return someChildContainsFile(file, false);
   }
 
   public void update(PresentationData presentation) {

platform/testFramework/src/com/intellij/testFramework/ProjectViewTestUtil.java

@@ -78,6 +78,9 @@ public class ProjectViewTestUtil {
         boolean actual = eachNode.contains(eachFile);
         boolean expected = map.get(eachFile).contains(eachNode);
         if (actual != expected) {
+          boolean actual1 = eachNode.contains(eachFile);
+          boolean expected1 = map.get(eachFile).contains(eachNode);
+
           Assert.assertTrue("file=" + eachFile + " node=" + eachNode.getTestPresentation() + " expected:" + expected, false);
         }
       }