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 'origin/feature/RM-4946MoveAPIs' into feature/RM-4950Tests

Browse Source 
# Conflicts:
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/dataprep/RecordsManagementService.java
#	rm-automation/rm-automation-ui/src/test/java/org/alfresco/test/BaseTest.java
This commit is contained in:
Oana Nechiforescu
2017-04-12 16:37:57 +03:00
parent 8491130d20 a24c4bb7df
commit bd718bd680
7 changed files with 1109 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,7 +214,6 @@ public class BaseRMRestTest extends RestTest
* @param recordCategoryId The id of the record category
* @param name The name of the record category child
* @param type The type of the record category child
* @param title The title of the record category child
* @return The created {@link RecordCategoryChild}
* @throws Exception {@link RecordCategoryAPI#createRecordCategoryChild(RecordCategoryChild, String)}
*/
@@ -227,11 +226,9 @@ public class BaseRMRestTest extends RestTest
/**
* Helper method to create a record category child as the admin user
*
* @param user The user under whose privileges the node is going to be created
* @param recordCategoryId The id of the record category
* @param name The name of the record category child
* @param type The type of the record category child
* @param title The title of the record category child
* @return The created {@link RecordCategoryChild}
* @throws Exception {@link RecordCategoryAPI#createRecordCategoryChild(RecordCategoryChild, String)}
*/
@@ -299,7 +296,6 @@ public class BaseRMRestTest extends RestTest
*
*@param user The user under whose privileges this structure is going to be created
* @param parentId The id of the parent folder
* @param folderName The name of the folder
* @param nodeType The child type
* @return The created folder
* @throws Exception on unsuccessful component creation
@@ -317,7 +313,6 @@ public class BaseRMRestTest extends RestTest
* Helper method to create child unfiled record folder as the admin user
*
* @param parentId The id of the parent folder
* @param folderName The name of the folder
* @param nodeType The child type
* @return The created folder
* @throws Exception on unsuccessful component creation