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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
98899: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98890: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         98886: Reverse merged V4.1-BUG-FIX (4.1.10)
            << Original commits for this issue caused a performance problem found in 5.0.1 testing >>
            98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
               98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
                 - Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
            98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
               - Corrected the solution to fix the build failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-06 22:36:57 +00:00
parent d3331bcd0f
commit 0c51454940
4 changed files with 47 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1135,46 +1135,6 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
}
}
public void testListSiteMemberships()
{
String siteName1 = "testMembership1";
String siteName2 = "testMembership2";
String siteName3 = "testMembership3";
// Create a site as user one
this.siteService.createSite(TEST_SITE_PRESET, siteName1, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PRIVATE);
// Get the members of the site and check that user one is a manager
List<SiteMembership> members = this.siteService.listSiteMemberships(USER_ONE, 0);
assertNotNull(members);
assertEquals(1, members.size());
assertEquals(USER_ONE, members.get(0).getPersonId());
assertEquals(SiteModel.SITE_MANAGER, members.get(0).getRole());
// Create a site as user two and add user one
this.authenticationComponent.setCurrentUser(USER_TWO);
this.siteService.createSite(TEST_SITE_PRESET, siteName2, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PRIVATE);
this.siteService.setMembership("testMembership2", USER_ONE, SiteModel.SITE_CONSUMER);
// Create a site as user three and add user one
this.authenticationComponent.setCurrentUser(USER_THREE);
this.siteService.createSite(TEST_SITE_PRESET, siteName3, TEST_TITLE, TEST_DESCRIPTION, SiteVisibility.PRIVATE);
this.siteService.setMembership("testMembership3", USER_ONE, SiteModel.SITE_COLLABORATOR);
this.authenticationComponent.setCurrentUser(USER_ONE);
members = this.siteService.listSiteMemberships(USER_ONE, 0);
assertNotNull(members);
assertEquals(3, members.size());
assertEquals(USER_ONE, members.get(0).getPersonId());
assertEquals(SiteModel.SITE_MANAGER, members.get(0).getRole());
assertEquals(siteName1, members.get(0).getSiteInfo().getShortName());
assertEquals(USER_ONE, members.get(1).getPersonId());
assertEquals(SiteModel.SITE_CONSUMER, members.get(1).getRole());
assertEquals(siteName2, members.get(1).getSiteInfo().getShortName());
assertEquals(USER_ONE, members.get(2).getPersonId());
assertEquals(SiteModel.SITE_COLLABORATOR, members.get(2).getRole());
assertEquals(siteName3, members.get(2).getSiteInfo().getShortName());
}
public void testJoinLeave()
{
// Create a site as user one