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

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

@@ -265,11 +265,12 @@ public class ResultMapperTests
@Test
public void testIsNullContext() throws Exception
{
assertTrue(mapper.isNullContext(new SearchContext(0l,null,null,null)));
assertFalse(mapper.isNullContext(new SearchContext(1l,null,null,null)));
assertFalse(mapper.isNullContext(new SearchContext(0l,null,null,new SpellCheckContext(null, null))));
assertFalse(mapper.isNullContext(new SearchContext(0l,Arrays.asList(new FacetQueryContext(null, 0)),null,null)));
assertFalse(mapper.isNullContext(new SearchContext(0l,null,Arrays.asList(new FacetFieldContext(null, null)),null)));
assertTrue(mapper.isNullContext(new SearchContext(0l,null,null,null,null)));
assertFalse(mapper.isNullContext(new SearchContext(1l,null,null,null,null)));
assertFalse(mapper.isNullContext(new SearchContext(0l,null,null,null,new SpellCheckContext(null, null))));
assertFalse(mapper.isNullContext(new SearchContext(0l,Arrays.asList(new FacetQueryContext(null, 0)),null,null,null)));
assertFalse(mapper.isNullContext(new SearchContext(0l,null,Arrays.asList(new FacetFieldContext(null, null)),null,null)));
assertFalse(mapper.isNullContext(new SearchContext(0l,null,null,Arrays.asList(new FacetFieldContext(null, null)),null)));
}
@Test

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;
}
}

31
source/test-java/org/alfresco/rest/api/search/SearchQuerySerializerTests.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.rest.api.search;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.alfresco.rest.api.search.context.FacetFieldContext;
import org.alfresco.rest.api.search.context.FacetFieldContext.Bucket;
@@ -41,11 +42,15 @@ import org.alfresco.rest.api.search.context.SearchContext;
import org.alfresco.rest.api.search.context.FacetQueryContext;
import org.alfresco.rest.framework.tests.api.mocks.Farmer;
import org.alfresco.service.cmr.search.FieldHighlightParameters;
import org.alfresco.service.cmr.search.Interval;
import org.alfresco.service.cmr.search.IntervalParameters;
import org.alfresco.service.cmr.search.IntervalSet;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
/**
* Tests json -> SearchQuery deserialization
@@ -137,6 +142,28 @@ public class SearchQuerySerializerTests
assertEquals(3, high2.getSnippetCount().intValue());
assertEquals(15, high2.getFragmentSize().intValue());
assertEquals(false,high2.getMergeContiguous());
//Facet intervals
IntervalParameters ip = searchQuery.getFacetIntervals();
assertNotNull(ip);
assertEquals(1,ip.getSets().size());
IntervalSet is = ip.getSets().get(0);
assertEquals("king", is.getLabel());
assertEquals("1", is.getStart());
assertEquals("2", is.getEnd());
assertEquals(true, is.isStartInclusive());
assertEquals(false, is.isEndInclusive());
assertEquals(1,ip.getIntervals().size());
Interval interval = ip.getIntervals().get(0);
assertEquals("Creator", interval.getLabel());
assertEquals("creator", interval.getField());
is = interval.getSets().get(0);
assertEquals("bob", is.getLabel());
assertEquals("a", is.getStart());
assertEquals("b", is.getEnd());
assertEquals(false, is.isStartInclusive());
assertEquals(true, is.isEndInclusive());
}
@Test
@@ -146,7 +173,7 @@ public class SearchQuerySerializerTests
FacetFieldContext ffc = new FacetFieldContext("theLabel", Arrays.asList(new Bucket("b1", 23, "displayText1"), new Bucket("b2", 34, "displayText2")));
SearchContext searchContext = new SearchContext(23l, Arrays.asList(new FacetQueryContext("f1", 15), new FacetQueryContext("f2", 20)),
Arrays.asList(ffc),
Arrays.asList(ffc), null,
new SpellCheckContext("aFlag", Arrays.asList("bish", "bash")));
CollectionWithPagingInfo<ExecutionResult> coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1), false, 2, null, searchContext);
String out = helper.writeResponse(coll);
@@ -159,7 +186,7 @@ public class SearchQuerySerializerTests
assertTrue("There must 'bucket1' json output", out.contains("{\"label\":\"b1\",\"count\":23,\"display\":\"displayText1\"}"));
assertTrue("There must 'bucket2' json output", out.contains("{\"label\":\"b2\",\"count\":34,\"display\":\"displayText2\"}"));
searchContext = new SearchContext(-1, null, null, null);
searchContext = new SearchContext(-1, null, null,null, null);
coll = CollectionWithPagingInfo.asPaged(null, Arrays.asList(exec1), false, 2, null, searchContext);
out = helper.writeResponse(coll);
assertTrue("There must NOT BE a 'context' json output", out.contains("\"context\":{}"));

4
source/test-java/org/alfresco/rest/api/search/SerializerTestHelper.java
View File

@@ -62,6 +62,10 @@ public class SerializerTestHelper implements RequestReader
+ "\"filterQueries\": [{\"query\": \"myquery\",\"tags\": [\"tag1\", \"tag2\"]},{\"query\": \"myquery2\"}],"
+ "\"facetFields\": {\"facets\": [{\"field\": \"cm:creator\",\"prefix\": \"myquery2\",\"sort\": \"COUNT\",\"missing\": \"false\"}, {\"field\": \"modifier\",\"label\": \"mylabel\",\"method\": \"FC\",\"mincount\": \"5\"}]},"
+ "\"facetQueries\": [{\"query\": \"facquery\",\"label\": \"facnoused\"}],"
+ "\"facetIntervals\": {\"sets\": [{ \"label\": \"king\", \"start\": \"1\", \"end\": \"2\",\"startInclusive\": true,\"endInclusive\": false}]"
+ ",\"intervals\": [{\"field\": \"creator\",\"label\": \"Creator\","
+ "\"sets\": [{\"label\": \"bob\",\"start\": \"a\",\"end\": \"b\",\"startInclusive\": false}]"
+ "}]},"
+ "\"spellcheck\": {\"query\": \"alfrezco\"},"
+ "\"limits\": {\"permissionEvaluationCount\": \"2000\",\"permissionEvaluationTime\": \"5000\"},"
+ "\"scope\": { \"locations\": [\"nodes\"]},"