inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.3) to HEAD (5.1)

Browse Source 
110822: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
      110619: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
         110422: Merged DEV to V4.2.5 (4.2.5)
            110332: MNT-14151 : CMIS Upload/Create in 4.2 adds the sys:hidden and cm:indexControl Aspect to documents starting with a period
               - added system property in order to enable/disable cmis hidden behavior
               


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-08-26 13:42:25 +00:00
parent 970409fa59
commit 271ce04935
8 changed files with 163 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/test-java/org/alfresco/repo/model/filefolder/HiddenAspectTest.java
View File

@@ -13,6 +13,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Properties;
import javax.transaction.NotSupportedException;
import javax.transaction.Status;
@@ -71,7 +72,7 @@ public class HiddenAspectTest
private static final ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
private HiddenAspect hiddenAspect;
protected HiddenAspect hiddenAspect;
private TransactionService transactionService;
private NodeDAO nodeDAO;
private NodeService nodeService;
@@ -97,6 +98,8 @@ public class HiddenAspectTest
private final String MAILBOX_NAME_B = ".mailbox_a";
private String username;
private AlfrescoImapUser user;
protected boolean cmisDisableHide;
@Before
public void setup() throws SystemException, NotSupportedException
@@ -117,6 +120,8 @@ public class HiddenAspectTest
imapEnabled = serviceRegistry.getImapService().getImapServerEnabled();
nodeDAO = (NodeDAO)ctx.getBean("nodeDAO");
Properties properties = (Properties) ctx.getBean("global-properties");
cmisDisableHide = Boolean.getBoolean(properties.getProperty("cmis.disable.hidden.leading.period.files"));
// start the transaction
txn = transactionService.getUserTransaction();
@@ -417,13 +422,13 @@ public class HiddenAspectTest
FileFilterMode.setClient(saveClient);
}
assertTrue(nodeService.hasAspect(child, ContentModel.ASPECT_HIDDEN));
assertTrue(nodeService.hasAspect(child, ContentModel.ASPECT_INDEX_CONTROL));
assertTrue(nodeService.hasAspect(child1, ContentModel.ASPECT_HIDDEN));
assertTrue(nodeService.hasAspect(child1, ContentModel.ASPECT_INDEX_CONTROL));
assertTrue(nodeService.hasAspect(child, ContentModel.ASPECT_HIDDEN) != cmisDisableHide );
assertTrue(nodeService.hasAspect(child, ContentModel.ASPECT_INDEX_CONTROL ) != cmisDisableHide);
assertTrue(nodeService.hasAspect(child1, ContentModel.ASPECT_HIDDEN) != cmisDisableHide);
assertTrue(nodeService.hasAspect(child1, ContentModel.ASPECT_INDEX_CONTROL) != cmisDisableHide);
List<FileInfo> children = fileFolderService.list(parent);
assertEquals(0, children.size());
assertEquals(cmisDisableHide ? 1: 0, children.size());
saveClient = FileFilterMode.setClient(Client.script);
try
@@ -434,7 +439,7 @@ public class HiddenAspectTest
{
FileFilterMode.setClient(saveClient);
}
assertEquals(0, children.size());
assertEquals(cmisDisableHide ? 1: 0, children.size());
saveClient = FileFilterMode.setClient(Client.cmis);
try
@@ -445,7 +450,7 @@ public class HiddenAspectTest
{
FileFilterMode.setClient(saveClient);
}
assertEquals(0, children.size());
assertEquals(cmisDisableHide ? 1: 0, children.size());
}
}