inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/release/V2.7.0.x' into feature/RM-6310_securityMarksSearchNotProperlyUpdated_AutomationTests

Browse Source
This commit is contained in:
jcule
2018-05-23 15:10:06 +01:00
parent 4c902ebf0e 43ad506338
commit d278ed86a9
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java
View File

@@ -63,12 +63,9 @@ public class SearchAPI extends BaseAPI
/** RM search URL template */
private static final String RM_SEARCH_ENDPOINT = "{0}alfresco/s/slingshot/rmsearch/{1}?{2}";
/** RM document search filters */
private static final String RM_DEFAULT_RECORD_FILTERS =
"records/true,undeclared/true,vital/false,folders/false,categories/false,frozen/false,cutoff/false";
/** RM all nodes search filters */
private static final String RM_DEFAULT_NODES_FILTERS =
"records/true,undeclared/true,vital/false,folders/true,categories/true,frozen/false,cutoff/false";
"records/true,undeclared/true,vital/false,folders/{0},categories/{1},frozen/false,cutoff/false";
/**
* Perform search request on search endpoint as a user.
@@ -123,7 +120,7 @@ public class SearchAPI extends BaseAPI
}
/**
* Search as a user for records on site "rm" matching query, using SearchAPI.RM_DEFAULT_RECORD_FILTERS and sorted
* Search as a user for nodes on site "rm" matching query, using SearchAPI.RM_DEFAULT_RECORD_FILTERS and sorted
* by sortby
* <br>
* If more fine-grained control of search parameters is required, use rmSearch() directly.
@@ -134,12 +131,12 @@ public class SearchAPI extends BaseAPI
* @return list of record names
*/
public List<String> searchForRecordsAsUser(
String username,
String password,
String query,
String sortby)
String username, String password,
String query, String sortby,
boolean includeCategories, boolean includeFolders)
{
return getItemNames(rmSearch(username, password, "rm", query, RM_DEFAULT_RECORD_FILTERS, sortby));
String searchFilterParamaters = MessageFormat.format(RM_DEFAULT_NODES_FILTERS, Boolean.toString(includeFolders), Boolean.toString(includeCategories));
return getItemNames(rmSearch(username, password, "rm", query, searchFilterParamaters, sortby));
}
/**

10
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
View File

@@ -689,7 +689,8 @@ public class BaseRMRestTest extends RestTest
* @param expectedResults
* @return
*/
public List<String> searchForRMContentAsUser(UserModel user, String term, String sortby, List<String> expectedResults)
public List<String> searchForRMContentAsUser(UserModel user, String term, String sortby, boolean includeFolders,
boolean includeCategories, List<String> expectedResults)
{
List<String> results = new ArrayList<>();
// wait for solr indexing
@@ -702,12 +703,13 @@ public class BaseRMRestTest extends RestTest
try
{
this.wait(waitInMilliSeconds);
} catch (InterruptedException e)
}
catch (InterruptedException e)
{
}
}
results = searchApi.searchForRmContentAsUser(user.getUsername(), user.getPassword(), term, sortby);
results = searchApi.searchForRecordsAsUser(user.getUsername(), user.getPassword(), term, sortby,
includeFolders, includeCategories);
if (!results.isEmpty() && results.containsAll(expectedResults))
{
break;