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

Browse Source 
130026 gjames: SEARCH-119: Implementing filter queries (without tags)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:36:32 +00:00
parent 5798ff7d0f
commit 81bb4937d1
6 changed files with 115 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@ import static org.alfresco.service.cmr.search.SearchService.LANGUAGE_LUCENE;
import static org.junit.Assert.assertNull;
import org.alfresco.rest.api.search.impl.SearchMapper;
import org.alfresco.rest.api.search.model.Default;
import org.alfresco.rest.api.search.model.FilterQuery;
import org.alfresco.rest.api.search.model.Query;
import org.alfresco.rest.api.search.model.SearchQuery;
import org.alfresco.rest.api.search.model.SortDef;
@@ -270,10 +271,25 @@ public class SearchMapperTests
searchMapper.validateInclude(Arrays.asList("properties", "aspectNames"));
}
@Test
public void fromFilterQuery() throws Exception
{
SearchParameters searchParameters = new SearchParameters();
//Doesn't error
searchMapper.fromFilterQuery(searchParameters, null);
searchMapper.fromFilterQuery(searchParameters, Arrays.asList(new FilterQuery("hedgehog", null), new FilterQuery("king", Arrays.asList("not", "used"))));
assertEquals(2 ,searchParameters.getFilterQueries().size());
assertEquals("hedgehog" ,searchParameters.getFilterQueries().get(0));
assertEquals("king" ,searchParameters.getFilterQueries().get(1));
//tags aren't used at the moment
}
private SearchQuery minimalQuery()
{
Query query = new Query("cmis", "foo", "");
SearchQuery sq = new SearchQuery(query,null, null, null, null, null);
SearchQuery sq = new SearchQuery(query,null, null, null, null, null, null);
return sq;
}
}

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

@@ -82,6 +82,10 @@ public class SearchQuerySerializerTests
assertEquals(2, defaults.getTextAttributes().size());
assertTrue(defaults.getTextAttributes().contains("roy"));
assertTrue(defaults.getTextAttributes().contains("king"));
assertEquals(2, searchQuery.getFilterQueries().size());
assertEquals("myquery",searchQuery.getFilterQueries().get(0).getQuery());
assertEquals(2, searchQuery.getFilterQueries().get(0).getTags().size());
assertEquals("myquery2",searchQuery.getFilterQueries().get(1).getQuery());
}
}

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

@@ -53,6 +53,7 @@ public class SerializerTestHelper implements RequestReader
+ "\"sort\": {\"type\": \"FIELD\",\"field\": \"cm:title\",\"ascending\": \"true\"},"
+ "\"templates\": [{\"name\": \"mytemp\",\"template\": \"ATEMP\"}, {\"name\": \"yourtemp\",\"template\": \"%cm:content\"}],"
+ "\"defaults\": {\"namespace\": \"namesp\",\"defaultFieldName\": \"myfield\",\"defaultFTSOperator\": \"AND\", \"textAttributes\": [\"roy\", \"king\"]},"
+ "\"filterQueries\": [{\"query\": \"myquery\",\"tags\": [\"tag1\", \"tag2\"]},{\"query\": \"myquery2\"}],"
+ "\"include\": [\"aspectNames\", \"properties\"]}";
public SerializerTestHelper()