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 
136081 gjames: Merged searchbcr (5.2.1) to 5.2.N (5.2.1)
      135511 gjames: SEARCH-372: Adding filterQuery to facetQueries result


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 10:58:43 +00:00
parent 97c6e79205
commit 867026b9a2
5 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,7 @@ import org.alfresco.rest.api.search.context.SpellCheckContext;
import org.alfresco.rest.api.search.impl.ResultMapper;
import org.alfresco.rest.api.search.impl.StoreMapper;
import org.alfresco.rest.api.search.model.HighlightEntry;
import org.alfresco.rest.api.search.model.SearchQuery;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Params;
@@ -110,6 +111,8 @@ public class ResultMapperTests
public static final String FROZEN_VER = "1.1";
private static final long VERSIONED_ID = 521l;
private static SerializerTestHelper helper;
@BeforeClass
public static void setupTests() throws Exception
{
@@ -205,12 +208,14 @@ public class ResultMapperTests
nodeVersionsRelation.setServiceRegistry(sr);
nodeVersionsRelation.afterPropertiesSet();
mapper.setNodeVersions(nodeVersionsRelation);
helper = new SerializerTestHelper();
}
@Test
public void testNoResults() throws Exception
{
CollectionWithPagingInfo<Node> collection = mapper.toCollectionWithPagingInfo(EMPTY_PARAMS,new EmptyResultSet());
CollectionWithPagingInfo<Node> collection = mapper.toCollectionWithPagingInfo(EMPTY_PARAMS, null, new EmptyResultSet());
assertNotNull(collection);
assertFalse(collection.hasMoreItems());
assertTrue(collection.getTotalItems() < 1);
@@ -221,7 +226,7 @@ public class ResultMapperTests
public void testToCollectionWithPagingInfo() throws Exception
{
ResultSet results = mockResultset(Arrays.asList(514l), Arrays.asList(566l, VERSIONED_ID));
CollectionWithPagingInfo<Node> collectionWithPage = mapper.toCollectionWithPagingInfo(EMPTY_PARAMS,results);
CollectionWithPagingInfo<Node> collectionWithPage = mapper.toCollectionWithPagingInfo(EMPTY_PARAMS, null, results);
assertNotNull(collectionWithPage);
Long found = results.getNumberFound();
assertEquals(found.intValue(), collectionWithPage.getTotalItems().intValue());
@@ -249,11 +254,13 @@ public class ResultMapperTests
public void testToSearchContext() throws Exception
{
ResultSet results = mockResultset(Collections.emptyList(),Collections.emptyList());
SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, 0);
SearchQuery searchQuery = helper.searchQueryFromJson();
SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchQuery, 0);
assertEquals(34l, searchContext.getConsistency().getlastTxId());
assertEquals(6, searchContext.getFacetQueries().size());
// assertEquals("{!afts}creator:admin",searchContext.getFacetQueries().get(0).getLabel());
// assertEquals(1,searchContext.getFacetQueries().get(0).getCount());
assertEquals(0,searchContext.getFacetQueries().get(0).getCount());
assertEquals("cm:created:bob",searchContext.getFacetQueries().get(0).getFilterQuery());
assertEquals("small",searchContext.getFacetQueries().get(0).getLabel());
assertEquals("searchInsteadFor",searchContext.getSpellCheck().getType());
assertEquals(1,searchContext.getSpellCheck().getSuggestions().size());
assertEquals("alfresco",searchContext.getSpellCheck().getSuggestions().get(0));
@@ -319,13 +326,5 @@ public class ResultMapperTests
ResultSet results = new SolrJSONResultSet(json,sp,nodeService, null, LimitBy.FINAL_SIZE, 10);
return results;
}
/**
private Params mockParams(SearchQuery searchQuery)
{
Params params = mock(Params.class);
when(params.getInclude()).thenReturn(new ArrayList<String>());
when(params.getPassedIn()).thenReturn(searchQuery);
return params;
}
**/
}

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

@@ -95,8 +95,8 @@ public class SearchQuerySerializerTests
assertEquals(2, searchQuery.getFilterQueries().get(0).getTags().size());
assertEquals("myquery2",searchQuery.getFilterQueries().get(1).getQuery());
assertEquals(1, searchQuery.getFacetQueries().size());
assertEquals("facquery",searchQuery.getFacetQueries().get(0).getQuery());
assertEquals("facnoused",searchQuery.getFacetQueries().get(0).getLabel());
assertEquals("cm:created:bob",searchQuery.getFacetQueries().get(0).getQuery());
assertEquals("small",searchQuery.getFacetQueries().get(0).getLabel());
assertEquals("alfrezco", searchQuery.getSpellcheck().getQuery());
assertEquals(1, searchQuery.getScope().getLocations().size());
assertEquals(StoreMapper.LIVE_NODES, searchQuery.getScope().getLocations().get(0));

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

@@ -61,7 +61,7 @@ public class SerializerTestHelper implements RequestReader
+ "\"defaults\": {\"namespace\": \"namesp\",\"defaultFieldName\": \"myfield\",\"defaultFTSOperator\": \"AND\", \"textAttributes\": [\"roy\", \"king\"]},"
+ "\"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\"}],"
+ "\"facetQueries\": [{\"query\": \"cm:created:bob\",\"label\": \"small\"}],"
+ "\"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}]"