mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.0 to HEAD
12145: Merged V2.2 to V3.0 (AuthenticationUtil) 12109: AuthenticationUtil and AuthenticationComponent refactor 12152: Removed Lucene usage from lookup of 'sites' root folder 12153: Fix InviteServiceTest by cleaning up leaking authentications 12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -316,7 +316,7 @@ public class AVMServicePermissionsTest extends TestCase
|
||||
|
||||
private boolean checkPermission(String user, String path, String permission, boolean allowed)
|
||||
{
|
||||
String curentUser = AuthenticationUtil.getCurrentUserName();
|
||||
String curentUser = AuthenticationUtil.getRunAsUser();
|
||||
try
|
||||
{
|
||||
runAs(user);
|
||||
@@ -335,7 +335,7 @@ public class AVMServicePermissionsTest extends TestCase
|
||||
|
||||
private boolean checkCanPerformance(String user, String path, String permission, boolean allowed, int count)
|
||||
{
|
||||
String curentUser = AuthenticationUtil.getCurrentUserName();
|
||||
String curentUser = AuthenticationUtil.getRunAsUser();
|
||||
try
|
||||
{
|
||||
runAs(user);
|
||||
@@ -362,7 +362,7 @@ public class AVMServicePermissionsTest extends TestCase
|
||||
|
||||
private boolean checkHasPermissionsPerformance(String user, String path, String permission, boolean allowed, int count)
|
||||
{
|
||||
String curentUser = AuthenticationUtil.getCurrentUserName();
|
||||
String curentUser = AuthenticationUtil.getRunAsUser();
|
||||
try
|
||||
{
|
||||
runAs(user);
|
||||
@@ -386,7 +386,7 @@ public class AVMServicePermissionsTest extends TestCase
|
||||
|
||||
public boolean checkHasPermission(String user, NodeRef nodeRef, String permission, boolean allowed)
|
||||
{
|
||||
String curentUser = AuthenticationUtil.getCurrentUserName();
|
||||
String curentUser = AuthenticationUtil.getRunAsUser();
|
||||
try
|
||||
{
|
||||
runAs(user);
|
||||
@@ -2184,18 +2184,6 @@ public class AVMServicePermissionsTest extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
private void checkHeadPermissionForNode(String path, String authority, String permission, boolean allow)
|
||||
{
|
||||
AVMNodeDescriptor desc = avmService.lookup(-1, path);
|
||||
checkHeadPermission(desc, authority, permission, allow);
|
||||
}
|
||||
|
||||
private void checkHeadPermissionNotSetForNode(String path, String authority, String permission, boolean allow)
|
||||
{
|
||||
AVMNodeDescriptor desc = avmService.lookup(-1, path);
|
||||
checkHeadPermissionNotSet(desc, authority, permission, allow);
|
||||
}
|
||||
|
||||
private void checkHeadPermission(AVMNodeDescriptor desc, String authority, String permission, boolean allow)
|
||||
{
|
||||
NodeRef nodeRef = AVMNodeConverter.ToNodeRef(-1, desc.getPath());
|
||||
@@ -2775,6 +2763,7 @@ public class AVMServicePermissionsTest extends TestCase
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
public void testWCMStyleTemplateAsBranch()
|
||||
{
|
||||
runAs("admin");
|
||||
|
Reference in New Issue
Block a user