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 searchrep (5.2.1) to 5.2.N (5.2.1)

Browse Source 
137019 msuzuki: Search-340, added unit test to cover range start and end inclusive options


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:23:14 +00:00
parent 2a2fe5c59e
commit 1bdcba877f
3 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
source/test-java/org/alfresco/rest/api/search/RangeResultMapperTests.java
View File

@@ -35,7 +35,6 @@ import java.util.Map;
import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericBucket;
import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
import org.alfresco.repo.search.impl.solr.facet.facetsresponse.RangeResultMapper;
import org.alfresco.rest.api.search.model.SearchQuery;
import org.alfresco.service.cmr.search.RangeParameters;
import org.junit.Test;
@@ -46,74 +45,97 @@ import org.junit.Test;
*/
public class RangeResultMapperTests
{
static Map<String,String> facet = new HashMap<String, String>();
{
facet.put("start", "0");
facet.put("end", "10");
}
@Test
public void testBuildGenericBucketFromRange() throws Exception
{
//=============== start bucket
GenericBucket response = queryWithInclude(null, "head");
GenericBucket response = queryWithInclude("head", null);
assertEquals("test:[0 TO 10>", response.getFilterQuery());
assertEquals("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("outer", "head");
response = queryWithInclude("head","outer");
assertEquals("test:<0 TO 10>", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("head","lower");
assertEquals("test:[0 TO 10>", response.getFilterQuery());
assertEquals("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("head","upper","lower");
assertEquals("test:[0 TO 10]", response.getFilterQuery());
assertEquals("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("lower", "head");
assertEquals("test:[0 TO 10<", response.getFilterQuery());
response = queryWithInclude("head","edge","upper");
assertEquals("test:[0 TO 10]", response.getFilterQuery());
assertEquals("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("edge", "head");
assertEquals("test:[0 TO 10<", response.getFilterQuery());
response = queryWithInclude("upper", "head");
assertEquals("test:]0 TO 10>", response.getFilterQuery());
response = queryWithInclude("head","upper");
assertEquals("test:<0 TO 10]", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
//=============== Non start end bucket
response = queryWithInclude("lower", "body");
assertEquals("test:[0 TO 10<", response.getFilterQuery());
assertEquals("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("upper", "body");
assertEquals("test:]0 TO 10>", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
//=============== End bucket
response = queryWithInclude("lower", "tail");
response = queryWithInclude("body","lower");
assertEquals("test:[0 TO 10>", response.getFilterQuery());
assertEquals("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("edge", "tail");
assertEquals("test:]0 TO 10]", response.getFilterQuery());
response = queryWithInclude("body","upper");
assertEquals("test:<0 TO 10]", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
//=============== End bucket
response = queryWithInclude("tail","lower");
assertEquals("test:[0 TO 10>", response.getFilterQuery());
assertEquals("true", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("tail","edge");
assertEquals("test:<0 TO 10]", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
response = queryWithInclude("upper", "tail");
assertEquals("test:]0 TO 10]", response.getFilterQuery());
response = queryWithInclude("tail","upper");
assertEquals("test:<0 TO 10]", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
//Before
response = queryWithInclude("head","before");
assertEquals("test:<0 TO 10>", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("false", response.getBucketInfo().get("endInclusive"));
response = queryWithIncludeAndOther("head","outer","before");
assertEquals("test:<0 TO 10]", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
//After
response = queryWithIncludeAndOther("head","outer","after");
assertEquals("test:<0 TO 10]", response.getFilterQuery());
assertEquals("false", response.getBucketInfo().get("startInclusive"));
assertEquals("true", response.getBucketInfo().get("endInclusive"));
}
private GenericBucket queryWithInclude(String param, String bucketPosition)
private GenericBucket queryWithInclude(String bucketPosition, String ...includeParam)
{
List<RangeParameters> ranges = new ArrayList<RangeParameters>();
if(param != null && !param.isEmpty())
if(includeParam != null && includeParam.length >= 1)
{
List<String> include = new ArrayList<String>();
include.add(param);
for(int i = 0; i < includeParam.length; i++)
{
include.add(includeParam[i]);
}
ranges.add(new RangeParameters("test", "0", "10", "1", true, null, include, null, null));
}
Map<String,String> facet = new HashMap<String,String>();
@@ -124,4 +146,24 @@ public class RangeResultMapperTests
facet.put(GenericFacetResponse.END, "10");
return RangeResultMapper.buildGenericBucketFromRange("test", facet, ranges);
}
private Map<String,String> buildFaet(String bucketPosition)
{
Map<String,String> facet = new HashMap<String,String>();
facet.put("bucketPosition", bucketPosition);
facet.put(GenericFacetResponse.LABEL, "test");
facet.put(GenericFacetResponse.COUNT, "11");
facet.put(GenericFacetResponse.START, "0");
facet.put(GenericFacetResponse.END, "10");
return facet;
}
private GenericBucket queryWithIncludeAndOther(String bucketPosition, String includeParam, String otherParam)
{
List<RangeParameters> ranges = new ArrayList<RangeParameters>();
List<String> include = new ArrayList<String>();
include.add(includeParam);
List<String> other = new ArrayList<String>();
other.add(otherParam);
ranges.add(new RangeParameters("test", "0", "10", "1", true, other, include, null, null));
return RangeResultMapper.buildGenericBucketFromRange("test", buildFaet(bucketPosition), ranges);
}
}

6
source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java
View File

@@ -491,7 +491,7 @@ public class ResultMapperTests
assertEquals("[0 - 100)",rangeFacets.get(1).getBuckets().get(0).getLabel());
Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray();
assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
assertEquals("content.size:[0 TO 100<", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
assertEquals("content.size:[0 TO 100>", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count"));
Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo();
assertEquals("0",facetInfo.get("start"));
@@ -503,7 +503,7 @@ public class ResultMapperTests
facetInfo = rangeFacets.get(1).getBuckets().get(1).getBucketInfo();
assertEquals("100",facetInfo.get("start"));
assertEquals("200",facetInfo.get("end"));
assertEquals("content.size:[100 TO 200<", rangeFacets.get(1).getBuckets().get(1).getFilterQuery());
assertEquals("content.size:[100 TO 200>", rangeFacets.get(1).getBuckets().get(1).getFilterQuery());
assertEquals(null,rangeFacets.get(1).getBuckets().get(1).getBucketInfo().get("count"));
assertEquals("false",rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("endInclusive"));
assertEquals("true",rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("startInclusive"));
@@ -536,7 +536,7 @@ public class ResultMapperTests
assertEquals("(0 - 100]",rangeFacets.get(1).getBuckets().get(0).getLabel());
Object[] metrics = rangeFacets.get(1).getBuckets().get(0).getMetrics().toArray();
assertEquals("4",((SimpleMetric) metrics[0]).getValue().get("count"));
assertEquals("content.size:]0 TO 100>", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
assertEquals("content.size:<0 TO 100]", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
assertEquals(null,rangeFacets.get(1).getBuckets().get(0).getBucketInfo().get("count"));
Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo();
assertEquals("0",facetInfo.get("start"));