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

Fix the failed test tomorrow

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2017-06-20 18:51:14 +00:00
parent fc391b7839
commit cf2240d301
2 changed files with 48 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/forum/CommentServiceImpl.java
View File

@@ -613,18 +613,17 @@ public class CommentServiceImpl extends AbstractLifecycleBean implements Comment
NodeRef discussableNodeRef = getDiscussableAncestor(commentNodeRef); NodeRef discussableNodeRef = getDiscussableAncestor(commentNodeRef);
if (discussableNodeRef.equals(discussableNode)) if (discussableNodeRef.equals(discussableNode))
{ {
if (!isWorkingCopyOrLocked(discussableNode) if (!isWorkingCopyOrLocked(discussableNode))
|| isLockOwner(discussableNode))
{ {
canEdit = canEditPermission(commentNodeRef); canEdit = canEditPermission(commentNodeRef);
canDelete = canDeletePermission(commentNodeRef); canDelete = canDeletePermission(commentNodeRef);
} }
} }
Map<String, Boolean> map = new HashMap<>(2); Map<String, Boolean> map = new HashMap<>(2);
map.put(CommentService.CAN_EDIT, canEdit); map.put(CommentService.CAN_EDIT, canEdit);
map.put(CommentService.CAN_DELETE, canDelete); map.put(CommentService.CAN_DELETE, canDelete);
return map; return map;
} }
@@ -638,17 +637,12 @@ public class CommentServiceImpl extends AbstractLifecycleBean implements Comment
boolean isCoordinator = permissionService.hasPermission(commentNodeRef, PermissionService.COORDINATOR) == (AccessStatus.ALLOWED); boolean isCoordinator = permissionService.hasPermission(commentNodeRef, PermissionService.COORDINATOR) == (AccessStatus.ALLOWED);
return (isSiteManager || isCoordinator || currentUser.equals(creator) || currentUser.equals(owner)); return (isSiteManager || isCoordinator || currentUser.equals(creator) || currentUser.equals(owner));
} }
private boolean canDeletePermission(NodeRef commentNodeRef) private boolean canDeletePermission(NodeRef commentNodeRef)
{ {
return permissionService.hasPermission(commentNodeRef, PermissionService.DELETE) == AccessStatus.ALLOWED; return permissionService.hasPermission(commentNodeRef, PermissionService.DELETE) == AccessStatus.ALLOWED;
} }
private boolean isLockOwner(NodeRef nodeRef)
{
return lockService.getLockStatus(nodeRef) == LockStatus.LOCK_OWNER?true:false;
}
private boolean isWorkingCopyOrLocked(NodeRef nodeRef) private boolean isWorkingCopyOrLocked(NodeRef nodeRef)
{ {
boolean isWorkingCopy = false; boolean isWorkingCopy = false;
@@ -673,7 +667,7 @@ public class CommentServiceImpl extends AbstractLifecycleBean implements Comment
} }
return (isWorkingCopy || isLocked); return (isWorkingCopy || isLocked);
} }
@Override @Override
public void onUpdateProperties(NodeRef commentNodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after) public void onUpdateProperties(NodeRef commentNodeRef, Map<QName, Serializable> before, Map<QName, Serializable> after)
{ {
@@ -681,11 +675,10 @@ public class CommentServiceImpl extends AbstractLifecycleBean implements Comment
if (discussableNodeRef != null) if (discussableNodeRef != null)
{ {
if (behaviourFilter.isEnabled(ContentModel.ASPECT_LOCKABLE) if (behaviourFilter.isEnabled(ContentModel.ASPECT_LOCKABLE)
&& isWorkingCopyOrLocked(discussableNodeRef) && isWorkingCopyOrLocked(discussableNodeRef))
&& !isLockOwner(discussableNodeRef))
{ {
List<QName> changedProperties = getChangedProperties(before, after); List<QName> changedProperties = getChangedProperties(before, after);
// check if comment updated (rather than some other change, eg. addition of lockable aspect only) // check if comment updated (rather than some other change, eg. addition of lockable aspect only)
boolean commentUpdated = false; boolean commentUpdated = false;
for (QName changedProperty : changedProperties) for (QName changedProperty : changedProperties)
@@ -700,7 +693,7 @@ public class CommentServiceImpl extends AbstractLifecycleBean implements Comment
} }
} }
} }
if (commentUpdated) if (commentUpdated)
{ {
throw new NodeLockedException(discussableNodeRef); throw new NodeLockedException(discussableNodeRef);
@@ -748,22 +741,20 @@ public class CommentServiceImpl extends AbstractLifecycleBean implements Comment
return results; return results;
} }
@Override @Override
public void beforeDeleteNode(final NodeRef commentNodeRef) public void beforeDeleteNode(final NodeRef commentNodeRef)
{ {
NodeRef discussableNodeRef = getDiscussableAncestor(commentNodeRef); NodeRef discussableNodeRef = getDiscussableAncestor(commentNodeRef);
if (discussableNodeRef != null) if (discussableNodeRef != null)
{ {
boolean canDelete = canDeletePermission(commentNodeRef);
if (behaviourFilter.isEnabled(ContentModel.ASPECT_LOCKABLE) // eg. delete site (MNT-14671) if (behaviourFilter.isEnabled(ContentModel.ASPECT_LOCKABLE) // eg. delete site (MNT-14671)
&& isWorkingCopyOrLocked(discussableNodeRef) && isWorkingCopyOrLocked(discussableNodeRef))
&& !isLockOwner(discussableNodeRef)
&& !canDelete)
{ {
throw new NodeLockedException(discussableNodeRef); throw new NodeLockedException(discussableNodeRef);
} }
boolean canDelete = canDeletePermission(commentNodeRef);
if (! canDelete) if (! canDelete)
{ {
throw new AccessDeniedException("Cannot delete comment"); throw new AccessDeniedException("Cannot delete comment");

171
source/test-java/org/alfresco/repo/forum/CommentsTest.java
View File

@@ -1,35 +1,34 @@
/* /*
* #%L * #%L
* Alfresco Repository * Alfresco Repository
* %% * %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited * Copyright (C) 2005 - 2016 Alfresco Software Limited
* %% * %%
* This file is part of the Alfresco software. * This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of * If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is * the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms: * provided under the following open source license terms:
* *
* Alfresco is free software: you can redistribute it and/or modify * Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* Alfresco is distributed in the hope that it will be useful, * Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L% * #L%
*/ */
package org.alfresco.repo.forum; package org.alfresco.repo.forum;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
@@ -42,7 +41,6 @@ import org.alfresco.model.ForumModel;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.domain.activities.ActivityPostDAO; import org.alfresco.repo.domain.activities.ActivityPostDAO;
import org.alfresco.repo.domain.activities.ActivityPostEntity; import org.alfresco.repo.domain.activities.ActivityPostEntity;
import org.alfresco.repo.lock.mem.Lifetime;
import org.alfresco.repo.model.Repository; import org.alfresco.repo.model.Repository;
import org.alfresco.repo.policy.BehaviourFilter; import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent;
@@ -52,9 +50,6 @@ import org.alfresco.repo.security.permissions.impl.ModelDAO;
import org.alfresco.repo.security.permissions.impl.PermissionServiceImpl; import org.alfresco.repo.security.permissions.impl.PermissionServiceImpl;
import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.service.cmr.lock.LockService;
import org.alfresco.service.cmr.lock.LockType;
import org.alfresco.service.cmr.lock.NodeLockedException;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentData; import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentService; import org.alfresco.service.cmr.repository.ContentService;
@@ -70,7 +65,6 @@ import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import org.alfresco.util.test.junitrules.AlfrescoPerson; import org.alfresco.util.test.junitrules.AlfrescoPerson;
import org.alfresco.util.test.junitrules.ApplicationContextInit; import org.alfresco.util.test.junitrules.ApplicationContextInit;
@@ -98,8 +92,6 @@ public class CommentsTest
private static final ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit(); private static final ApplicationContextInit APP_CONTEXT_INIT = new ApplicationContextInit();
public static final String USER_ONE_NAME = "userone"; public static final String USER_ONE_NAME = "userone";
public static final String USER_TWO_NAME = "usertwo";
public static final String USER_THREE_NAME = "userthree";
public static final AlfrescoPerson TEST_USER1 = new AlfrescoPerson(APP_CONTEXT_INIT, USER_ONE_NAME); public static final AlfrescoPerson TEST_USER1 = new AlfrescoPerson(APP_CONTEXT_INIT, USER_ONE_NAME);
// Tie them together in a static Rule Chain // Tie them together in a static Rule Chain
@@ -132,7 +124,6 @@ public class CommentsTest
private static ActivityPostDAO postDAO; private static ActivityPostDAO postDAO;
private static PermissionServiceImpl permissionServiceImpl; private static PermissionServiceImpl permissionServiceImpl;
private static ModelDAO permissionModelDAO; private static ModelDAO permissionModelDAO;
private static LockService lockService;
// These NodeRefs are used by the test methods. // These NodeRefs are used by the test methods.
private static NodeRef COMPANY_HOME; private static NodeRef COMPANY_HOME;
@@ -156,10 +147,7 @@ public class CommentsTest
postDAO = (ActivityPostDAO)APP_CONTEXT_INIT.getApplicationContext().getBean("postDAO"); postDAO = (ActivityPostDAO)APP_CONTEXT_INIT.getApplicationContext().getBean("postDAO");
permissionServiceImpl = (PermissionServiceImpl)APP_CONTEXT_INIT.getApplicationContext().getBean("permissionServiceImpl"); permissionServiceImpl = (PermissionServiceImpl)APP_CONTEXT_INIT.getApplicationContext().getBean("permissionServiceImpl");
permissionModelDAO = (ModelDAO)APP_CONTEXT_INIT.getApplicationContext().getBean("permissionsModelDAO"); permissionModelDAO = (ModelDAO)APP_CONTEXT_INIT.getApplicationContext().getBean("permissionsModelDAO");
lockService = (LockService)APP_CONTEXT_INIT.getApplicationContext().getBean("lockService");
COMPANY_HOME = repositoryHelper.getCompanyHome(); COMPANY_HOME = repositoryHelper.getCompanyHome();
} }
@@ -172,7 +160,7 @@ public class CommentsTest
testDocs = new ArrayList<NodeRef>(3); testDocs = new ArrayList<NodeRef>(3);
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
NodeRef testNode = testNodes.createQuickFile(MimetypeMap.MIMETYPE_TEXT_PLAIN, testFolder, "testDocInFolder_" + GUID.generate() + "_" + i, TEST_USER1.getUsername()); NodeRef testNode = testNodes.createQuickFile(MimetypeMap.MIMETYPE_TEXT_PLAIN, COMPANY_HOME, "testDocInFolder" + i, TEST_USER1.getUsername());
testDocs.add(testNode); testDocs.add(testNode);
} }
} }
@@ -180,6 +168,8 @@ public class CommentsTest
// MNT-11667 "createComment" method creates activity for users who are not supposed to see the file // MNT-11667 "createComment" method creates activity for users who are not supposed to see the file
@Test public void testMNT11667() throws Exception @Test public void testMNT11667() throws Exception
{ {
final String userTwo = "usertwo";
try try
{ {
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>() transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
@@ -189,17 +179,17 @@ public class CommentsTest
{ {
authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
createUser(USER_TWO_NAME); createUser(userTwo);
assertTrue(siteService.hasSite(testSite.getShortName())); assertTrue(siteService.hasSite(testSite.getShortName()));
authenticationComponent.setCurrentUser(USER_ONE_NAME); authenticationComponent.setCurrentUser(USER_ONE_NAME);
// invite user to a site with 'Collaborator' role // invite user to a site with 'Collaborator' role
siteService.setMembership(testSite.getShortName(), USER_TWO_NAME, SiteModel.SITE_COLLABORATOR); siteService.setMembership(testSite.getShortName(), userTwo, SiteModel.SITE_COLLABORATOR);
assertEquals(SiteModel.SITE_MANAGER, siteService.getMembersRole(testSite.getShortName(), USER_ONE_NAME)); assertEquals(SiteModel.SITE_MANAGER, siteService.getMembersRole(testSite.getShortName(), USER_ONE_NAME));
assertEquals(SiteModel.SITE_COLLABORATOR, siteService.getMembersRole(testSite.getShortName(), USER_TWO_NAME)); assertEquals(SiteModel.SITE_COLLABORATOR, siteService.getMembersRole(testSite.getShortName(), userTwo));
// get container of site // get container of site
NodeRef doclib = siteService.getContainer(testSite.getShortName(), SiteService.DOCUMENT_LIBRARY); NodeRef doclib = siteService.getContainer(testSite.getShortName(), SiteService.DOCUMENT_LIBRARY);
@@ -243,7 +233,7 @@ public class CommentsTest
assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.WRITE)) == AccessStatus.ALLOWED); assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.WRITE)) == AccessStatus.ALLOWED);
assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.DELETE)) == AccessStatus.ALLOWED); assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.DELETE)) == AccessStatus.ALLOWED);
authenticationComponent.setCurrentUser(USER_TWO_NAME); authenticationComponent.setCurrentUser(userTwo);
assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.READ)) == AccessStatus.DENIED); assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.READ)) == AccessStatus.DENIED);
assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.WRITE)) == AccessStatus.DENIED); assertTrue(permissionServiceImpl.hasPermission(nodeRef, getPermission(PermissionService.WRITE)) == AccessStatus.DENIED);
@@ -258,14 +248,14 @@ public class CommentsTest
{ {
authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName()); authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
if (personService.personExists(USER_TWO_NAME)) if (personService.personExists(userTwo))
{ {
personService.deletePerson(USER_TWO_NAME); personService.deletePerson(userTwo);
} }
if (authenticationService.authenticationExists(USER_TWO_NAME)) if (authenticationService.authenticationExists(userTwo))
{ {
authenticationService.deleteAuthentication(USER_TWO_NAME); authenticationService.deleteAuthentication(userTwo);
} }
} }
@@ -406,93 +396,6 @@ public class CommentsTest
} }
}); });
} }
/**
* REPO-2557, ALF-21907
*/
@Test public void testAddingCommentOnLockedNode()
{
// create user 2 and 3
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
createUser(USER_TWO_NAME);
createUser(USER_THREE_NAME);
siteService.setMembership(testSite.getShortName(), USER_TWO_NAME, SiteModel.SITE_MANAGER);
siteService.setMembership(testSite.getShortName(), USER_THREE_NAME, SiteModel.SITE_MANAGER);
return null;
}
});
// switch to user 1
authenticationComponent.setCurrentUser(USER_ONE_NAME);
// create some comments
final NodeRef testDoc = testDocs.get(0);
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
applyComment(testDoc, "Hello 1");
applyComment(testDoc, "Hello 2");
return null;
}
});
authenticationComponent.setCurrentUser(USER_TWO_NAME);
// lock node
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
lockService.lock(testDoc, LockType.WRITE_LOCK, (int) 3600, Lifetime.PERSISTENT, "someInfo");
return null;
}
});
authenticationComponent.setCurrentUser(USER_THREE_NAME);
try
{
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
applyComment(testDoc, "Hello 3");
return null;
}
});
fail("NodeLockedException not thrown");
}
catch(NodeLockedException e)
{
// Fails because is not the lock owner
}
// change to lock owner
authenticationComponent.setCurrentUser(USER_TWO_NAME);
transactionHelper.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{
@Override
public Void execute() throws Throwable
{
applyComment(testDoc, "Hello 3");
return null;
}
});
assertCommentCountIs(testDoc, 3);
authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
}
/** /**
* This test method tests that nodes whose commentCount is set to -1 have their commentCounts recalculated. * This test method tests that nodes whose commentCount is set to -1 have their commentCounts recalculated.