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 HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
102713: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      102494: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         102420: MNT-13710 : User cannot change site role if its current role contains an underscore
          Build failed. Was corected some junit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-02 07:19:06 +00:00
parent f38566ccf1
commit d87d938309
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/test-java/org/alfresco/repo/site/SiteServiceImplTest.java
View File

@@ -677,8 +677,6 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
public void testMNT_13710() throws Exception public void testMNT_13710() throws Exception
{ {
final String user = "user";
String siteName = "test" + System.currentTimeMillis(); String siteName = "test" + System.currentTimeMillis();
List<String> roleList = new ArrayList<String>(); List<String> roleList = new ArrayList<String>();
@@ -691,13 +689,11 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
SiteInfo siteInfo = this.siteService.createSite(siteName, siteName, siteName, siteName, SiteVisibility.PUBLIC); SiteInfo siteInfo = this.siteService.createSite(siteName, siteName, siteName, siteName, SiteVisibility.PUBLIC);
createUser(user, user);
for(String role : roleList) for(String role : roleList)
{ {
this.siteService.setMembership(siteInfo.getShortName(), user, role); this.siteService.setMembership(siteInfo.getShortName(), USER_ONE, role);
List<String> list = this.siteServiceImpl.getMembersRoles(siteName, user); List<String> list = this.siteServiceImpl.getMembersRoles(siteName, USER_ONE);
assertTrue(list.contains(role)); assertTrue(list.contains(role));
} }
@@ -708,11 +704,6 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
{ {
siteService.deleteSite(siteName); siteService.deleteSite(siteName);
} }
if (this.personService.getPerson(user) != null)
{
this.personService.deletePerson(user);
}
} }
} }
@@ -1381,8 +1372,8 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
assertNotNull(roles); assertNotNull(roles);
assertFalse(roles.isEmpty()); assertFalse(roles.isEmpty());
// By default there are just the 4 roles // By default there are just the 4 roles, but in classpath:org/alfresco/repo/site/site-custom-context.xml there are 7
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));
@@ -1473,14 +1464,14 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
// Check the roles on it // Check the roles on it
List<String> roles = siteService.getSiteRoles(); List<String> roles = siteService.getSiteRoles();
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_MANAGER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_MANAGER));
roles = siteService.getSiteRoles(site.getShortName()); roles = siteService.getSiteRoles(site.getShortName());
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));
@@ -1492,14 +1483,14 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
// Check again // Check again
roles = siteService.getSiteRoles(); roles = siteService.getSiteRoles();
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_MANAGER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_MANAGER));
roles = siteService.getSiteRoles(site.getShortName()); roles = siteService.getSiteRoles(site.getShortName());
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));
@@ -1522,7 +1513,7 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
siteServiceImpl.setPermissionService(testPermissionService); siteServiceImpl.setPermissionService(testPermissionService);
roles = siteService.getSiteRoles(); roles = siteService.getSiteRoles();
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));
@@ -1536,14 +1527,14 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
// Put the permissions back // Put the permissions back
siteServiceImpl.setPermissionService(permissionService); siteServiceImpl.setPermissionService(permissionService);
roles = siteService.getSiteRoles(); roles = siteService.getSiteRoles();
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_MANAGER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_MANAGER));
roles = siteService.getSiteRoles(site.getShortName()); roles = siteService.getSiteRoles(site.getShortName());
assertEquals(4, roles.size()); assertEquals(7, roles.size());
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONSUMER));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_CONTRIBUTOR));
assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR)); assertEquals(true, roles.contains(SiteServiceImpl.SITE_COLLABORATOR));