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

Refactor 'move to' REST API test method.

Browse Source
This commit is contained in:
Tom Page
2017-11-09 16:02:52 +00:00
parent 5322621100
commit d0636e79c9
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,8 @@ import static org.alfresco.dataprep.AlfrescoHttpClient.MIME_TYPE_JSON;
import static org.apache.http.HttpStatus.SC_OK; import static org.apache.http.HttpStatus.SC_OK;
import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.fail;
import java.io.IOException; import java.io.IOException;
import java.text.MessageFormat; import java.text.MessageFormat;
@@ -147,15 +149,16 @@ public class RMRolesAndActionsAPI extends BaseAPI
* @param password the user's password * @param password the user's password
* @param contentPath path to the content to be moved * @param contentPath path to the content to be moved
* @param destinationPath destination path * @param destinationPath destination path
* @return true if the action completed successfully * @throws AssertionError if the move was unsuccessful.
*/ */
public boolean moveTo(String user, String password, String contentPath, String destinationPath) public void moveTo(String user, String password, String contentPath, String destinationPath)
{ {
String contentNodeRef = getNodeRefSpacesStore() + getItemNodeRef(user, password, contentPath); String contentNodeRef = getNodeRefSpacesStore() + getItemNodeRef(user, password, contentPath);
AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject(); AlfrescoHttpClient client = alfrescoHttpClientFactory.getObject();
String url = MessageFormat.format(client.getAlfrescoUrl() + "alfresco/s/slingshot/doclib/" + MOVE_ACTIONS_API, destinationPath); String url = MessageFormat.format(client.getAlfrescoUrl() + "alfresco/s/slingshot/doclib/" + MOVE_ACTIONS_API, destinationPath);
HttpPost request = new HttpPost(url); HttpPost request = new HttpPost(url);
boolean success = false;
try try
{ {
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
@@ -169,18 +172,17 @@ public class RMRolesAndActionsAPI extends BaseAPI
{ {
case HttpStatus.SC_OK: case HttpStatus.SC_OK:
JSONObject json = new JSONObject(EntityUtils.toString(response.getEntity())); JSONObject json = new JSONObject(EntityUtils.toString(response.getEntity()));
return (Boolean) json.get("overallSuccess"); success = (Boolean) json.get("overallSuccess");
break;
case HttpStatus.SC_NOT_FOUND: case HttpStatus.SC_NOT_FOUND:
LOGGER.info("The provided paths couldn't be found " + response.toString()); LOGGER.info("The provided paths couldn't be found " + response.toString());
break;
default: default:
LOGGER.error("Unable to move: " + response.toString()); LOGGER.error("Unable to move: " + response.toString());
break;
} }
} }
catch (JSONException e) catch (JSONException | IOException e)
{
e.printStackTrace();
}
catch (IOException e)
{ {
e.printStackTrace(); e.printStackTrace();
} }
@@ -193,7 +195,30 @@ public class RMRolesAndActionsAPI extends BaseAPI
client.close(); client.close();
} }
return false; assertTrue("Moving " + contentPath + " to " + destinationPath + " failed.", success);
}
/**
* Move action
*
* @param user the user to move the contentPath
* @param password the user's password
* @param contentPath path to the content to be moved
* @param destinationPath destination path
* @throws AssertionError if the move was unexpectedly successful.
*/
public void moveToAndExpectFailure(String user, String password, String contentPath, String destinationPath)
{
try
{
moveTo(user, password, contentPath, destinationPath);
}
catch(AssertionError e)
{
// We are expecting the move to fail.
return;
}
fail("Moving " + contentPath + " to " + destinationPath + " succeeded unexpectedly.");
} }
/** /**