From d62668db533440436493867dd10a3ce848654d10 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 14:44:40 +0000 Subject: [PATCH] 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 --- .../repo/model/filefolder/HiddenAspectTest.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/test-java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java b/source/test-java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java index 93c4a41f6e..e1cff544a3 100644 --- a/source/test-java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java +++ b/source/test-java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java @@ -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(); assertTrue(nodeService.hasAspect(node, ContentModel.ASPECT_HIDDEN)); assertTrue(nodeService.hasAspect(node, ContentModel.ASPECT_INDEX_CONTROL)); @@ -277,10 +277,13 @@ public class HiddenAspectTest assertEquals("", 0, results.length()); for(Client client : hiddenAspect.getClients()) { - if(client != Client.admin) - { - assertEquals("Client " + client.toString(), Visibility.NotVisible, hiddenAspect.getVisibility(client, node)); - } + if(client != Client.admin) + { + if(client != Client.webdav) + { + assertEquals("Client " + client.toString(), Visibility.NotVisible, hiddenAspect.getVisibility(client, node)); + } + } } } finally