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 
130503 gjames: SEARCH-114: Switching to use limit, missed test commit


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:10:27 +00:00
parent 3fabbb3c59
commit 976b860eff
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -88,7 +88,7 @@ public class SearchMapperTests
assertEquals("There should be only 1 default store", 1,searchParameters.getStores().size()); assertEquals("There should be only 1 default store", 1,searchParameters.getStores().size());
assertEquals("workspaces store is the default", StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, searchParameters.getStores().get(0)); assertEquals("workspaces store is the default", StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, searchParameters.getStores().get(0));
assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy()); assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy());
assertEquals(100, searchParameters.getMaxItems()); assertEquals(100, searchParameters.getLimit());
searchParameters = searchMapper.toSearchParameters(helper.searchQueryFromJson()); searchParameters = searchMapper.toSearchParameters(helper.searchQueryFromJson());
assertNotNull(searchParameters); assertNotNull(searchParameters);
@@ -158,7 +158,7 @@ public class SearchMapperTests
Paging paging = Paging.DEFAULT; Paging paging = Paging.DEFAULT;
searchMapper.fromPaging(searchParameters, paging); searchMapper.fromPaging(searchParameters, paging);
assertEquals(searchParameters.getMaxItems(),paging.getMaxItems()); assertEquals(searchParameters.getLimit(),paging.getMaxItems());
assertEquals(searchParameters.getSkipCount(),paging.getSkipCount()); assertEquals(searchParameters.getSkipCount(),paging.getSkipCount());
} }
@@ -484,16 +484,16 @@ public class SearchMapperTests
//Doesn't error //Doesn't error
searchMapper.fromLimits(searchParameters, null); searchMapper.fromLimits(searchParameters, null);
assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy()); assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy());
assertEquals(100, searchParameters.getMaxItems()); assertEquals(100, searchParameters.getLimit());
searchMapper.fromLimits(searchParameters, new Limits(null, null)); searchMapper.fromLimits(searchParameters, new Limits(null, null));
assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy()); assertEquals(LimitBy.FINAL_SIZE, searchParameters.getLimitBy());
assertEquals(100, searchParameters.getMaxItems()); assertEquals(100, searchParameters.getLimit());
searchMapper.fromLimits(searchParameters, new Limits(null, 34)); searchMapper.fromLimits(searchParameters, new Limits(null, 34));
assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy()); assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
assertEquals(34, searchParameters.getMaxPermissionChecks()); assertEquals(34, searchParameters.getMaxPermissionChecks());
assertEquals(-1, searchParameters.getMaxItems()); assertEquals(-1, searchParameters.getLimit());
assertEquals(-1, searchParameters.getMaxPermissionCheckTimeMillis()); assertEquals(-1, searchParameters.getMaxPermissionCheckTimeMillis());
searchParameters = new SearchParameters(); searchParameters = new SearchParameters();
@@ -501,7 +501,7 @@ public class SearchMapperTests
searchMapper.fromLimits(searchParameters, new Limits(1000, null)); searchMapper.fromLimits(searchParameters, new Limits(1000, null));
assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy()); assertEquals(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, searchParameters.getLimitBy());
assertEquals(1000, searchParameters.getMaxPermissionCheckTimeMillis()); assertEquals(1000, searchParameters.getMaxPermissionCheckTimeMillis());
assertEquals(-1, searchParameters.getMaxItems()); assertEquals(-1, searchParameters.getLimit());
assertEquals(-1, searchParameters.getMaxPermissionChecks()); assertEquals(-1, searchParameters.getMaxPermissionChecks());
} }