A handful of tests of more arcane scenarios. Fixed issues as found.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java

@@ -353,7 +353,9 @@ public class LayeredDirectoryNode extends DirectoryNode implements Layered
      */
     public boolean directlyContains(AVMNode node)
     {
-        return fData.getAdded().containsValue(node.getDataBean());
+        DirectoryEntry entry = new DirectoryEntry(node.getType(),
+                                                  node.getDataBean());
+        return fData.getAdded().containsValue(entry);
     }
 
     /* (non-Javadoc)