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.1) to HEAD (5.2)

Browse Source 
130185 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129838 gjames: SEARCH-117: Implementing templates


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130336 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:05:32 +00:00
parent 5d442553f5
commit 3db8c1b295
6 changed files with 99 additions and 4 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

@@ -37,6 +37,7 @@ import org.alfresco.rest.api.search.impl.SearchMapper;
import org.alfresco.rest.api.search.model.Query;
import org.alfresco.rest.api.search.model.SearchQuery;
import org.alfresco.rest.api.search.model.SortDef;
import org.alfresco.rest.api.search.model.Template;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.resource.parameters.Paging;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -182,6 +183,21 @@ public class SearchMapperTests
});
}
@Test
public void fromTemplate() throws Exception
{
SearchParameters searchParameters = new SearchParameters();
//Doesn't error
searchMapper.fromTemplate(searchParameters, null);
searchMapper.fromTemplate(searchParameters, Arrays.asList(new Template("hedge", "hog"), new Template("king", "kong"), new Template("bish", "bash")));
assertEquals(3 ,searchParameters.getQueryTemplates().size());
assertEquals("hog" ,searchParameters.getQueryTemplates().get("hedge"));
assertEquals("kong" ,searchParameters.getQueryTemplates().get("king"));
assertEquals("bash" ,searchParameters.getQueryTemplates().get("bish"));
}
@Test
public void validateInclude() throws Exception
{
@@ -216,7 +232,7 @@ public class SearchMapperTests
private SearchQuery minimalQuery()
{
Query query = new Query("cmis", "foo", "");
SearchQuery sq = new SearchQuery(query,null, null, null);
SearchQuery sq = new SearchQuery(query,null, null, null, null);
return sq;
}
}

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

@@ -72,6 +72,8 @@ public class SearchQuerySerializerTests
assertEquals(2, searchQuery.getInclude().size());
assertTrue(searchQuery.getInclude().contains("aspectNames"));
assertTrue(searchQuery.getInclude().contains("properties"));
assertEquals(1, searchQuery.getSort().size());
assertEquals(2, searchQuery.getTemplates().size());
}
}

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

@@ -50,7 +50,8 @@ public class SerializerTestHelper implements RequestReader
public static final String JSON = "{ \"query\": {\"query\": \"g*\",\"userQuery\": \"great\",\"language\": \"afts\"}, "
+ "\"paging\": {\"maxItems\": \"99\",\"skipCount\": \"4\"},"
+ "\"sort\": {\"type\": \"FIELD\",\"field\": \"king\",\"ascending\": \"true\"},"
+ "\"sort\": {\"type\": \"FIELD\",\"field\": \"cm:title\",\"ascending\": \"true\"},"
+ "\"templates\": [{\"name\": \"mytemp\",\"template\": \"ATEMP\"}, {\"name\": \"yourtemp\",\"template\": \"%cm:content\"}],"
+ "\"include\": [\"aspectNames\", \"properties\"]}";
public SerializerTestHelper()