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/feature/RM-5645_Automate_AC_Prevent_Classification_Beyond_Parents_Classification' into feature/RM-5458_Tests_Prevent_FolderClassification

Browse Source 
# Conflicts:
#	rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRMRestTest.java
#	rm-automation/rm-automation-enterprise-rest-api/src/test/java/org/alfresco/rest/rm/enterprise/utils/ClassificationUtils.java
This commit is contained in:
Rodica Sutu
2017-10-09 20:33:39 +03:00
parent 7c80e30254 98ca8daf09
commit 41deff0d6a
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import javafx.util.Pair;
import org.alfresco.dataprep.ContentService;
import org.alfresco.rest.RestTest;
import org.alfresco.rest.core.RestAPIFactory;
@@ -72,7 +71,6 @@ import org.alfresco.rest.rm.community.requests.gscore.api.RMSiteAPI;
import org.alfresco.rest.rm.community.requests.gscore.api.RecordCategoryAPI;
import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI;
import org.alfresco.rest.rm.community.requests.gscore.api.RecordsAPI;
import org.alfresco.rest.rm.community.util.ParameterCheck;
import org.alfresco.rest.search.RestRequestQueryModel;
import org.alfresco.rest.search.SearchNodeModel;
import org.alfresco.rest.search.SearchRequest;
@@ -82,7 +80,6 @@ import org.alfresco.utility.model.ContentModel;
import org.alfresco.utility.model.FolderModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.UserModel;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.testng.annotations.BeforeClass;
@@ -618,22 +615,6 @@ public class BaseRMRestTest extends RestTest
}
return names;
}
/**
* Helper method to get the error response code and message from the provided setClassificationResponse
*
* @param setClassificationResponse
* @return a pair of <code, message> representing the code and message from the response
*/
public Pair<Integer,String> parseErrorResponse(JSONObject setClassificationResponse)
{
ParameterCheck.mandatoryObject("setClassificationResponse", setClassificationResponse);
String message = setClassificationResponse.getString("message");
String code = setClassificationResponse.getJSONObject("status").get("code").toString();
return new Pair<>(Integer.valueOf(code), message);
}
/**
* Helper method to return site document library content model