inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
128334 adavis: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      128318 jvonka: MNT-16446: Edit Comment permission (part 1)
      - for v0 api so far (as per specifically described test case) ... more to follow !


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@128727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2016-07-12 11:59:26 +00:00
parent 5c4a450d30
commit c7bba00551
2 changed files with 220 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
source/test-java/org/alfresco/repo/web/scripts/comment/CommentsApiTest.java
View File

@@ -68,20 +68,28 @@ import org.springframework.context.ApplicationContext;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
import org.springframework.extensions.webscripts.WebScriptException;
/**
* TODO: Fix the loose transaction handling.
* TODO: Rationalise with other v0 Comment REST API tests (eg. see BlogServiceTest ... etc). See also ACE-5437.
*/
public class CommentsApiTest extends BaseWebScriptTest
{
// V0 Comments REST API
private static final String URL_POST_COMMENT = "api/node/{0}/{1}/{2}/comments";
private static final String URL_DELETE_COMMENT = "api/comment/node/{0}/{1}/{2}?site={3}&itemtitle={4}&page={5}&pageParams={6}";
private static final String URL_PUT_COMMENT = "api/comment/node/{0}/{1}/{2}";
private static final String JSON = "application/json";
private static final String SITE_SHORT_NAME = "SomeTestSiteShortName";
private static final String SITE_SHORT_NAME = "SomeTestSiteShortName-"+System.currentTimeMillis();
private static final String USER_ONE = "SomeTestUserOne";
private static final String USER_TWO = "SomeTestUserTwo";
private static final String USER_THREE = "SomeTestUserThree";
private static final String USER_FOUR = "SomeTestUserFour";
private static final String JSON_KEY_NODEREF = "nodeRef";
private static final String JSON_KEY_ITEM = "item";
@@ -99,13 +107,16 @@ public class CommentsApiTest extends BaseWebScriptTest
private AuthenticationComponent authenticationComponent;
protected PermissionServiceSPI permissionService;
protected ModelDAO permissionModelDAO;
private NodeRef rootNodeRef;
private NodeRef companyHomeNodeRef;
private NodeRef companyHomeNodeRef;
private NodeRef sharedHomeNodeRef;
private NodeRef nodeRef;
private NodeRef sitePage;
private static final String USER_TEST = "UserTest";
private static final String DOCLIB_CONTAINER = "documentLibrary";
private UserTransaction txn;
@@ -139,15 +150,24 @@ public class CommentsApiTest extends BaseWebScriptTest
txn = transactionService.getUserTransaction();
txn.begin();
// Get Company Home
rootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
List<NodeRef> results = searchService.selectNodes(rootNodeRef, "/app:company_home", null, namespaceService, false);
if (results.size() == 0)
{
throw new AlfrescoRuntimeException("Can't find /app:company_home");
}
companyHomeNodeRef = results.get(0);
// Get Shared
results = searchService.selectNodes(rootNodeRef, "/app:company_home/app:shared", null, namespaceService, false);
if (results.size() == 0)
{
throw new AlfrescoRuntimeException("Can't find /app:company_home/app:shared");
}
sharedHomeNodeRef = results.get(0);
results = searchService.selectNodes(rootNodeRef, "/app:company_home/cm:Commenty", null, namespaceService, false);
if (results.size() > 0)
{
@@ -177,13 +197,23 @@ public class CommentsApiTest extends BaseWebScriptTest
siteInfo = siteService.createSite("SomeTestSite", SITE_SHORT_NAME, "SiteTitle", "SiteDescription", SiteVisibility.PUBLIC);
}
NodeRef docLibContainer = siteService.getContainer(SITE_SHORT_NAME, DOCLIB_CONTAINER);
if (docLibContainer == null)
{
siteService.createContainer(SITE_SHORT_NAME, DOCLIB_CONTAINER, ContentModel.TYPE_FOLDER, null);
}
txn = transactionService.getUserTransaction();
txn.begin();
// Create users
createUser(USER_ONE, SiteModel.SITE_CONSUMER);
createUser(USER_TWO, SiteModel.SITE_CONTRIBUTOR);
createUser(USER_THREE, SiteModel.SITE_COLLABORATOR);
createUser(USER_FOUR, SiteModel.SITE_COLLABORATOR);
// Create site page
sitePage = nodeService.createNode(siteInfo.getNodeRef(),
ContentModel.ASSOC_CONTAINS,
@@ -228,11 +258,13 @@ public class CommentsApiTest extends BaseWebScriptTest
// delete the users
deleteUser(USER_ONE);
deleteUser(USER_TWO);
deleteUser(USER_THREE);
deleteUser(USER_FOUR);
}
/**
* add a comment to given node ref
*
*
* @param nodeRef
* @param user
* @param status
@@ -245,7 +277,7 @@ public class CommentsApiTest extends BaseWebScriptTest
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
// Not allowed if you're not an admin
AuthenticationUtil.setFullyAuthenticatedUser(user);
@@ -286,6 +318,94 @@ public class CommentsApiTest extends BaseWebScriptTest
return response;
}
/**
* delete comment
*
* @param commentNodeRef
* @param parentNodeRef
* @param user
* @param status
* @throws Exception
*/
private void deleteComment(NodeRef commentNodeRef, NodeRef parentNodeRef, String user, int status) throws Exception
{
Response response = null;
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
// Not allowed if you're not an admin
AuthenticationUtil.setFullyAuthenticatedUser(user);
String itemTitle = "Test Title";
String page = "document-details";
StringBuilder pageParamsBuilder = new StringBuilder("{");
pageParamsBuilder.append("\"nodeRef\" : \"");
pageParamsBuilder.append(parentNodeRef.toString());
pageParamsBuilder.append("\", ");
pageParamsBuilder.append("}");
String pageParams = pageParamsBuilder.toString();
String URL = MessageFormat.format(URL_DELETE_COMMENT, new Object[] { commentNodeRef.getStoreRef().getProtocol(),
commentNodeRef.getStoreRef().getIdentifier(), commentNodeRef.getId(), SITE_SHORT_NAME, itemTitle, page, pageParams });
response = sendRequest(new DeleteRequest(URL), status);
assertEquals(status, response.getStatus());
// Normally, webscripts are in their own transaction. The test
// infrastructure here forces us to have a transaction
// around the calls. if the WebScript fails, then we should rollback.
if (response.getStatus() == 500)
{
txn.rollback();
}
else
{
txn.commit();
}
}
/**
*
* @param nodeRef
* @param user
* @param expectedStatus
* @return
* @throws Exception
*/
private Response updateComment(NodeRef nodeRef, String user, int expectedStatus) throws Exception
{
Response response = null;
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
AuthenticationUtil.setFullyAuthenticatedUser(user);
String now = System.currentTimeMillis()+"";
JSONObject comment = new JSONObject();
comment.put("title", "Test title updated "+now);
comment.put("content", "Test comment updated "+now);
response = sendRequest(new PutRequest(MessageFormat.format(URL_PUT_COMMENT,
new Object[] {nodeRef.getStoreRef().getProtocol(), nodeRef.getStoreRef().getIdentifier(), nodeRef.getId()}), comment.toString(), JSON), expectedStatus);
assertEquals(expectedStatus, response.getStatus());
// Normally, webscripts are in their own transaction. The test infrastructure here forces us to have a transaction
// around the calls. if the WebScript fails, then we should rollback.
if (response.getStatus() == 500)
{
txn.rollback();
}
else
{
txn.commit();
}
return response;
}
private String getCurrentVersion(NodeRef nodeRef) throws Exception
{
@@ -333,8 +453,88 @@ public class CommentsApiTest extends BaseWebScriptTest
txn.commit();
}
/**
* MNT-16446
* @throws Exception
*/
public void testCommentUpdateAndDeletePermission() throws Exception
{
authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
NodeRef sharedContent = null;
NodeRef siteContent = null;
{
//
// in Shared folder
//
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
sharedContent = fileFolderService.create(sharedHomeNodeRef, "SharedContent" + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
txn.commit();
Response response = addComment(sharedContent, USER_THREE, 200);
JSONObject jsonResponse = parseResponseJSON(response);
NodeRef commentNodeRef = new NodeRef(getOrNull(jsonResponse, JSON_KEY_NODEREF));
// MNT-16446 - now returns 403 rather than 500
// -ve test:
updateComment(commentNodeRef, USER_FOUR, 403);
updateComment(commentNodeRef, USER_THREE, 200);
// -ve test: ideally would return 403, but currently v0 REST API returns 500 :-(
deleteComment(commentNodeRef, sharedContent, USER_FOUR, 500);
deleteComment(commentNodeRef, sharedContent, USER_THREE, 200);
}
{
//
// in a public Site
//
txn = transactionService.getUserTransaction();
txn.begin();
NodeRef siteDocLibNodeRef = siteService.getContainer(SITE_SHORT_NAME, DOCLIB_CONTAINER);
siteContent = fileFolderService.create(siteDocLibNodeRef, "SiteContent" + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
txn.commit();
Response response = addComment(siteContent, USER_THREE, 200);
JSONObject jsonResponse = parseResponseJSON(response);
NodeRef commentNodeRef = new NodeRef(getOrNull(jsonResponse, JSON_KEY_NODEREF));
// MNT-16446 - now returns 403 rather than 200 !!
// -ve test:
updateComment(commentNodeRef, USER_FOUR, 403);
updateComment(commentNodeRef, USER_THREE, 200);
// -ve test: ideally would return 403, but currently v0 REST API returns 500 :-(
deleteComment(commentNodeRef, siteContent, USER_FOUR, 500);
deleteComment(commentNodeRef, siteContent, USER_THREE, 200);
}
{
// cleanup
authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
txn = transactionService.getUserTransaction();
txn.begin();
if (sharedContent != null)
{
nodeService.deleteNode(sharedContent);
}
if (siteContent != null)
{
nodeService.deleteNode(siteContent);
}
txn.commit();
}
}
private void createUser(String userName)
{
// if user with given user name doesn't already exist then create user
@@ -478,54 +678,6 @@ public class CommentsApiTest extends BaseWebScriptTest
authenticationService.deleteAuthentication(user);
}
}
/**
* delete comment
*
* @param commentNodeRef
* @param parentNodeRef
* @param user
* @param status
* @throws Exception
*/
private void deleteComment(NodeRef commentNodeRef, NodeRef parentNodeRef, String user, int status) throws Exception
{
Response response = null;
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
// Not allowed if you're not an admin
AuthenticationUtil.setFullyAuthenticatedUser(user);
String itemTitle = "Test Title";
String page = "document-details";
StringBuilder pageParamsBuilder = new StringBuilder("{");
pageParamsBuilder.append("\"nodeRef\" : \"");
pageParamsBuilder.append(parentNodeRef.toString());
pageParamsBuilder.append("\", ");
pageParamsBuilder.append("}");
String pageParams = pageParamsBuilder.toString();
String URL = MessageFormat.format(URL_DELETE_COMMENT, new Object[] { commentNodeRef.getStoreRef().getProtocol(),
commentNodeRef.getStoreRef().getIdentifier(), commentNodeRef.getId(), SITE_SHORT_NAME, itemTitle, page, pageParams });
response = sendRequest(new DeleteRequest(URL), status);
assertEquals(status, response.getStatus());
// Normally, webscripts are in their own transaction. The test
// infrastructure here forces us to have a transaction
// around the calls. if the WebScript fails, then we should rollback.
if (response.getStatus() == 500)
{
txn.rollback();
}
else
{
txn.commit();
}
}
/**
* returns value from JSON for a given key