mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged 5.2.N (5.2.2) to HEAD (5.2)
137060 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1) 136808 gjames: SEARCH-339: Adding bucketInfo for intervals with consistent names git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -491,23 +491,23 @@ public class ResultMapperTests
|
||||
assertEquals("content.size:(0 TO 100)", rangeFacets.get(1).getBuckets().get(0).getFilterQuery());
|
||||
|
||||
Map<String, String> facetInfo = rangeFacets.get(1).getBuckets().get(0).getBucketInfo();
|
||||
assertEquals("0",facetInfo.get("from"));
|
||||
assertEquals("100",facetInfo.get("to"));
|
||||
assertEquals("0",facetInfo.get("start"));
|
||||
assertEquals("100",facetInfo.get("end"));
|
||||
|
||||
assertEquals("100 - 200",rangeFacets.get(1).getBuckets().get(1).getLabel());
|
||||
metrics = rangeFacets.get(1).getBuckets().get(1).getMetrics().toArray();
|
||||
assertEquals("6",((SimpleMetric) metrics[0]).getValue().get("count"));
|
||||
facetInfo = rangeFacets.get(1).getBuckets().get(1).getBucketInfo();
|
||||
assertEquals("100",facetInfo.get("from"));
|
||||
assertEquals("200",facetInfo.get("to"));
|
||||
assertEquals("100",facetInfo.get("start"));
|
||||
assertEquals("200",facetInfo.get("end"));
|
||||
assertEquals("content.size:(100 TO 200)", rangeFacets.get(1).getBuckets().get(1).getFilterQuery());
|
||||
|
||||
assertEquals("200 - 300",rangeFacets.get(1).getBuckets().get(2).getLabel());
|
||||
metrics = rangeFacets.get(1).getBuckets().get(2).getMetrics().toArray();
|
||||
assertEquals("3",((SimpleMetric) metrics[0]).getValue().get("count"));
|
||||
facetInfo = rangeFacets.get(1).getBuckets().get(2).getBucketInfo();
|
||||
assertEquals("200",facetInfo.get("from"));
|
||||
assertEquals("300",facetInfo.get("to"));
|
||||
assertEquals("200",facetInfo.get("start"));
|
||||
assertEquals("300",facetInfo.get("end"));
|
||||
assertEquals("content.size:(200 TO 300)", rangeFacets.get(1).getBuckets().get(2).getFilterQuery());
|
||||
}
|
||||
|
||||
|
@@ -881,8 +881,23 @@ public class SearchMapperTests
|
||||
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);
|
||||
|
||||
try
|
||||
{
|
||||
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
|
||||
fail();
|
||||
}
|
||||
catch (InvalidArgumentException iae)
|
||||
{
|
||||
//duplicate labels
|
||||
assertNotNull(iae);
|
||||
}
|
||||
|
||||
intervalList = Arrays.asList(new Interval("cm:price", "Prices", null), new Interval("cm:price", "Pricey", anIntervalSet));
|
||||
intervalParameters = new IntervalParameters(intervalSets,intervalList);
|
||||
searchMapper.fromFacetIntervals(searchParameters, intervalParameters);
|
||||
assertEquals(searchParameters.getInterval(), intervalParameters);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Reference in New Issue
Block a user