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.2) to HEAD (5.2)

Browse Source 
137067 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136888 msuzuki: Search-340, align range response with interval response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:17:00 +00:00
parent ecf8dae504
commit 57fabd13a8
4 changed files with 45 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,13 @@ import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_FTS_ALFRESC
import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.alfresco.rest.api.search.context.SearchRequestContext;
import org.alfresco.rest.api.search.impl.SearchMapper;
import org.alfresco.rest.api.search.impl.StoreMapper;
@@ -1000,12 +1007,17 @@ public class SearchMapperTests
assertEquals(searchParameters.getRanges(), rangeParams);
rangeParams.clear();
rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true,"before","lower",null,null));
List<String> includes = new ArrayList<String>();
includes.add("lower");
List<String> other = new ArrayList<String>();
includes.add("before");
rangeParams.add(new RangeParameters("content.size", "0", "100000", "1000",true, other,includes,null,null));
searchMapper.fromRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRanges(), rangeParams);
//Assert multiple ranges
rangeParams.add(new RangeParameters("created", "2015-09-29T10:45:15.729Z", "2016-09-29T10:45:15.729Z", "+100DAY", true, "before", "lower", null, null));
rangeParams.add(new RangeParameters("created", "2015-09-29T10:45:15.729Z", "2016-09-29T10:45:15.729Z", "+100DAY", true, other, includes, null, null));
searchMapper.fromRange(searchParameters, rangeParams);
assertEquals(searchParameters.getRanges(), rangeParams);
assertEquals(2,searchParameters.getRanges().size());