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 
136077 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135431 gjames: SEARCH-339: A basic restapi for facet intevals


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 10:58:13 +00:00
parent ca1054e794
commit 21cbaef6a3
8 changed files with 218 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,9 @@ import org.alfresco.rest.framework.resource.parameters.Paging;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.FieldHighlightParameters;
import org.alfresco.service.cmr.search.GeneralHighlightParameters;
import org.alfresco.service.cmr.search.Interval;
import org.alfresco.service.cmr.search.IntervalParameters;
import org.alfresco.service.cmr.search.IntervalSet;
import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
@@ -60,6 +63,7 @@ import org.alfresco.service.cmr.search.SearchService;
import org.junit.BeforeClass;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -569,10 +573,79 @@ public class SearchMapperTests
assertEquals(searchParameters.getHighlight(), highlightParameters);
}
@Test
public void fromInterval() throws Exception
{
SearchParameters searchParameters = new SearchParameters();
IntervalParameters intervalParameters = new IntervalParameters(null, null);
try
{
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
fail();
}
catch (IllegalArgumentException iae)
{
//intervals is required
assertNotNull(iae);
}
List<IntervalSet> intervalSets = Arrays.asList(new IntervalSet(null,"1", null, null, null));
List<Interval> intervalList = Arrays.asList(new Interval(null, "bob", null));
intervalParameters = new IntervalParameters(intervalSets,intervalList);
try
{
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
fail();
}
catch (IllegalArgumentException iae)
{
//facetIntervals intervals field is required
assertNotNull(iae);
}
intervalList = Arrays.asList(new Interval("aFileld", "bob", null));
intervalParameters = new IntervalParameters(intervalSets,intervalList);
try
{
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
fail();
}
catch (IllegalArgumentException iae)
{
//set start is required
assertNotNull(iae);
}
intervalSets = Arrays.asList(new IntervalSet("1",null, null, null, true));
intervalParameters = new IntervalParameters(intervalSets,intervalList);
try
{
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
fail();
}
catch (IllegalArgumentException iae)
{
//set end is required
assertNotNull(iae);
}
intervalSets = new ArrayList<>();
intervalSets.add(new IntervalSet("0", "3", "bob", null, null));
intervalSets.add(new IntervalSet("30", "50", "bill", true,true));
List<IntervalSet> anIntervalSet = new ArrayList<>();
anIntervalSet.add(new IntervalSet("1", "10", "bert", false, false));
intervalList = Arrays.asList(new Interval("cm:price", "Price", null), new Interval("cm:price", "Price", anIntervalSet));
intervalParameters = new IntervalParameters(intervalSets,intervalList);
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
assertEquals(searchParameters.getInterval(), intervalParameters);
}
private SearchQuery minimalQuery()
{
Query query = new Query("cmis", "foo", "");
SearchQuery sq = new SearchQuery(query,null, null, null, null, null, null, null, null, null, null, null, null, null);
SearchQuery sq = new SearchQuery(query,null, null, null, null, null, null, null, null, null, null, null, null, null, null);
return sq;
}
}