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

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
130783 jvonka: REPO-1058: REST API - list sites that person is member of ...
   - fix orderBy tests and backward compatibility
   - REPO-1242,  / REPO-1244


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:19:56 +00:00
parent 3a473a5d0d
commit b34bbcfccc
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -130,8 +130,11 @@ public class SitesImpl implements Sites
{ {
Map<String,SiteService.SortFields> aMap = new HashMap<>(3); Map<String,SiteService.SortFields> aMap = new HashMap<>(3);
aMap.put(PARAM_SITE_TITLE, SiteService.SortFields.SiteTitle); aMap.put(PARAM_SITE_TITLE, SiteService.SortFields.SiteTitle);
aMap.put(SiteService.SortFields.SiteTitle.toString(), SiteService.SortFields.SiteTitle); // for backwards compat'
aMap.put(PARAM_SITE_ID, SiteService.SortFields.SiteShortName); aMap.put(PARAM_SITE_ID, SiteService.SortFields.SiteShortName);
aMap.put(SiteService.SortFields.SiteShortName.toString(), SiteService.SortFields.SiteShortName); // for backwards compat'
aMap.put(PARAM_SITE_ROLE, SiteService.SortFields.Role); aMap.put(PARAM_SITE_ROLE, SiteService.SortFields.Role);
aMap.put(SiteService.SortFields.Role.toString(), SiteService.SortFields.Role); // for backwards compat'
SORT_SITE_MEMBERSHIP = Collections.unmodifiableMap(aMap); SORT_SITE_MEMBERSHIP = Collections.unmodifiableMap(aMap);
} }

24
source/test-java/org/alfresco/rest/api/tests/TestPersonSites.java
View File

@@ -522,7 +522,7 @@ public class TestPersonSites extends EnterpriseTestApi
/** /**
* Tests the capability to sort and paginate the site memberships associated * Tests the capability to sort and paginate the site memberships associated
* to a user order = Title ASC skip = 1, count = 2 * to a user orderBy = title ASC skip = 1, count = 2
* *
* @throws Exception * @throws Exception
*/ */
@@ -535,7 +535,7 @@ public class TestPersonSites extends EnterpriseTestApi
Paging paging = getPaging(skipCount, maxItems, totalResults, null); Paging paging = getPaging(skipCount, maxItems, totalResults, null);
// get memberships // get memberships
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteTitle", true); ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "title", true);
// check results // check results
List<MemberOfSite> expectedList = new LinkedList<>(); List<MemberOfSite> expectedList = new LinkedList<>();
@@ -548,7 +548,7 @@ public class TestPersonSites extends EnterpriseTestApi
/** /**
* Tests the capability to sort and paginate the site memberships associated * Tests the capability to sort and paginate the site memberships associated
* to a user order = Title DESC skip = 1, count = 2 * to a user orderBy = title DESC skip = 1, count = 2
* *
* @throws Exception * @throws Exception
*/ */
@@ -561,7 +561,7 @@ public class TestPersonSites extends EnterpriseTestApi
Paging paging = getPaging(skipCount, maxItems, totalResults, null); Paging paging = getPaging(skipCount, maxItems, totalResults, null);
// get memberships // get memberships
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteTitle", false); ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "title", false);
// check results // check results
List<MemberOfSite> expectedList = new LinkedList<>(); List<MemberOfSite> expectedList = new LinkedList<>();
@@ -573,7 +573,7 @@ public class TestPersonSites extends EnterpriseTestApi
/** /**
* Tests the capability to sort and paginate the site memberships associated * Tests the capability to sort and paginate the site memberships associated
* to a user order = Role ASC skip = 1, count = 2 * to a user orderBy = role ASC skip = 1, count = 2
* *
* @throws Exception * @throws Exception
*/ */
@@ -586,7 +586,7 @@ public class TestPersonSites extends EnterpriseTestApi
Paging paging = getPaging(skipCount, maxItems, totalResults, null); Paging paging = getPaging(skipCount, maxItems, totalResults, null);
// get memberships // get memberships
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "Role", true); ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "role", true);
// check results // check results
List<MemberOfSite> expectedList = new LinkedList<>(); List<MemberOfSite> expectedList = new LinkedList<>();
@@ -598,7 +598,7 @@ public class TestPersonSites extends EnterpriseTestApi
/** /**
* Tests the capability to sort and paginate the site memberships associated * Tests the capability to sort and paginate the site memberships associated
* to a user order = Role DESC skip = 1, count = 2 * to a user orderBy = role DESC skip = 1, count = 2
* *
* @throws Exception * @throws Exception
*/ */
@@ -611,7 +611,7 @@ public class TestPersonSites extends EnterpriseTestApi
Paging paging = getPaging(skipCount, maxItems, totalResults, null); Paging paging = getPaging(skipCount, maxItems, totalResults, null);
// get memberships // get memberships
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "Role", false); ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "role", false);
// check results // check results
List<MemberOfSite> expectedList = new LinkedList<>(); List<MemberOfSite> expectedList = new LinkedList<>();
@@ -623,7 +623,7 @@ public class TestPersonSites extends EnterpriseTestApi
/** /**
* Tests the capability to sort and paginate the site memberships associated * Tests the capability to sort and paginate the site memberships associated
* to a user order = Site Name ASC skip = 1, count = 2 * to a user orderBy = id ASC skip = 1, count = 2
* *
* @throws Exception * @throws Exception
*/ */
@@ -636,7 +636,7 @@ public class TestPersonSites extends EnterpriseTestApi
Paging paging = getPaging(skipCount, maxItems, totalResults, null); Paging paging = getPaging(skipCount, maxItems, totalResults, null);
// get memberships // get memberships
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteShortName", true); ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "id", true);
// check results // check results
List<MemberOfSite> expectedList = new LinkedList<>(); List<MemberOfSite> expectedList = new LinkedList<>();
@@ -648,7 +648,7 @@ public class TestPersonSites extends EnterpriseTestApi
/** /**
* Tests the capability to sort and paginate the site memberships associated * Tests the capability to sort and paginate the site memberships associated
* to a user order = Site Name DESC skip = 1, count = 2 * to a user orderBy = id DESC skip = 1, count = 2
* *
* @throws Exception * @throws Exception
*/ */
@@ -661,7 +661,7 @@ public class TestPersonSites extends EnterpriseTestApi
Paging paging = getPaging(skipCount, maxItems, totalResults, null); Paging paging = getPaging(skipCount, maxItems, totalResults, null);
// get memberships // get memberships
ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "SiteShortName", false); ListResponse<MemberOfSite> resp = getSiteMembershipsForPerson32(paging, "id", false);
// check results // check results
List<MemberOfSite> expectedList = new LinkedList<>(); List<MemberOfSite> expectedList = new LinkedList<>();