inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
121650 sdinuta: CM-710: Merged from alfresco/BRANCHES/DEV/VF_REP_INT_51/root into/alfresco/HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-01-29 14:49:19 +00:00
parent c1d4fccc48
commit 9f2d3441df
63 changed files with 643 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/test-java/org/alfresco/repo/virtual/bundle/VirtualPermissionServiceExtensionTest.java
View File

@@ -57,7 +57,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
private NodeRef virtualContent;
private VirtualStoreImpl virtualStore;
private VirtualStoreImpl smartStore;
/** original user permissions to be restored on tear down */
private VirtualUserPermissions savedUserPermissions;
@@ -68,7 +68,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
super.setUp();
// we set our own virtual user permissions in order to be context xml
// independent
virtualStore = VirtualPermissionServiceExtensionTest.ctx.getBean("virtualStore",
smartStore = VirtualPermissionServiceExtensionTest.ctx.getBean("smartStore",
VirtualStoreImpl.class);
permissionService = VirtualPermissionServiceExtensionTest.ctx.getBean("permissionServiceImpl",
@@ -115,19 +115,19 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
protected void setUpTestPermissions()
{
// we save the original permissions
savedUserPermissions = virtualStore.getUserPermissions();
savedUserPermissions = smartStore.getUserPermissions();
VirtualUserPermissions testPermissions = new VirtualUserPermissions(savedUserPermissions);
Set<String> allowVirtualNodes = new HashSet<>(savedUserPermissions.getAllowVirtualNodes());
Set<String> allowSmartNodes = new HashSet<>(savedUserPermissions.getAllowSmartNodes());
// we force create children on virtual nodes
allowVirtualNodes.add(PermissionService.CREATE_CHILDREN);
allowSmartNodes.add(PermissionService.CREATE_CHILDREN);
testPermissions.setAllowVirtualNodes(allowVirtualNodes);
testPermissions.setAllowSmartNodes(allowSmartNodes);
testPermissions.init();
virtualStore.setUserPermissions(testPermissions);
smartStore.setUserPermissions(testPermissions);
}
@Override
@@ -135,7 +135,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
{
if (savedUserPermissions != null)
{
virtualStore.setUserPermissions(savedUserPermissions);
smartStore.setUserPermissions(savedUserPermissions);
savedUserPermissions = null;
}
@@ -617,7 +617,7 @@ public class VirtualPermissionServiceExtensionTest extends VirtualizationIntegra
private String asTypedPermission(String perm)
{
return virtualStore.getUserPermissions().getPermissionTypeQName() + "." + perm;
return smartStore.getUserPermissions().getPermissionTypeQName() + "." + perm;
}
}