Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

60938: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60837: MNT-10333: WebDAV - Cannot save existing Alfresco Microsoft Office 2011 documents into Alfresco on Mountain Lion
       - Update unit test that is failing after fix was merged to 4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 14:44:40 +00:00
parent 7d59e9392c
commit d62668db53

View File

@@ -269,7 +269,7 @@ public class HiddenAspectTest
} }
} }
// Resource fork should not be visible to any client // Resource fork should not be visible to any client except webdav(see MNT-10333)
node = fileFolderService.create(topNodeRef, "._resourceFork", ContentModel.TYPE_FOLDER).getNodeRef(); node = fileFolderService.create(topNodeRef, "._resourceFork", ContentModel.TYPE_FOLDER).getNodeRef();
assertTrue(nodeService.hasAspect(node, ContentModel.ASPECT_HIDDEN)); assertTrue(nodeService.hasAspect(node, ContentModel.ASPECT_HIDDEN));
assertTrue(nodeService.hasAspect(node, ContentModel.ASPECT_INDEX_CONTROL)); assertTrue(nodeService.hasAspect(node, ContentModel.ASPECT_INDEX_CONTROL));
@@ -277,10 +277,13 @@ public class HiddenAspectTest
assertEquals("", 0, results.length()); assertEquals("", 0, results.length());
for(Client client : hiddenAspect.getClients()) for(Client client : hiddenAspect.getClients())
{ {
if(client != Client.admin) if(client != Client.admin)
{ {
assertEquals("Client " + client.toString(), Visibility.NotVisible, hiddenAspect.getVisibility(client, node)); if(client != Client.webdav)
} {
assertEquals("Client " + client.toString(), Visibility.NotVisible, hiddenAspect.getVisibility(client, node));
}
}
} }
} }
finally finally