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

RM-5645 - review changes

Browse Source
This commit is contained in:
Ana Bozianu
2017-10-09 16:53:10 +03:00
parent d94e96395f
commit 8ff0a24952
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,6 +53,7 @@ import static org.testng.Assert.assertTrue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javafx.util.Pair;
import org.alfresco.dataprep.ContentService; import org.alfresco.dataprep.ContentService;
import org.alfresco.rest.RestTest; import org.alfresco.rest.RestTest;
import org.alfresco.rest.core.RestAPIFactory; import org.alfresco.rest.core.RestAPIFactory;
@@ -70,6 +71,7 @@ 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.RecordCategoryAPI;
import org.alfresco.rest.rm.community.requests.gscore.api.RecordFolderAPI; 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.requests.gscore.api.RecordsAPI;
import org.alfresco.rest.rm.community.util.ParameterCheck;
import org.alfresco.rest.search.RestRequestQueryModel; import org.alfresco.rest.search.RestRequestQueryModel;
import org.alfresco.rest.search.SearchNodeModel; import org.alfresco.rest.search.SearchNodeModel;
import org.alfresco.rest.search.SearchRequest; import org.alfresco.rest.search.SearchRequest;
@@ -616,24 +618,18 @@ public class BaseRMRestTest extends RestTest
} }
/** /**
* Helper method to check the response code and message returned * Helper method to get the error response code and message from the provided setClassificationResponse
* *
* @param setClassificationResponse * @param setClassificationResponse
* @param nodeId * @return a pair of <code, message> representing the code and message from the response
*/ */
public List<String> getResponseCodeAndMessage(JSONObject setClassificationResponse, String nodeId) public Pair<Integer,String> parseErrorResponse(JSONObject setClassificationResponse)
{ {
List<String> response = new ArrayList<String>(); ParameterCheck.mandatoryObject("setClassificationResponse", setClassificationResponse);
if (setClassificationResponse != null)
{ String message = setClassificationResponse.getString("message");
String message = setClassificationResponse.getString("message"); String code = setClassificationResponse.getJSONObject("status").get("code").toString();
response.add(message);
if (setClassificationResponse.getJSONObject("status") != null) return new Pair<>(Integer.valueOf(code), message);
{
String code = setClassificationResponse.getJSONObject("status").get("code").toString();
response.add(code);
}
}
return response;
} }
} }