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 0fe8eaa44e f4daa23a42
commit 4c4ef8dc3b
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;