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

ALF-9153 Unit tests for the discussions listing CQs permissions

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-08-22 13:15:43 +00:00
parent 318cfae1b1
commit 9c62f6938c
2 changed files with 167 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/discussion/DiscussionServiceImpl.java
View File

@@ -41,6 +41,7 @@ import org.alfresco.repo.node.getchildren.GetChildrenWithTargetAssocsAuditableCa
import org.alfresco.repo.query.NodeBackedEntity; import org.alfresco.repo.query.NodeBackedEntity;
import org.alfresco.repo.query.NodeWithTargetsEntity; import org.alfresco.repo.query.NodeWithTargetsEntity;
import org.alfresco.repo.query.NodeWithTargetsEntity.TargetAndTypeId; import org.alfresco.repo.query.NodeWithTargetsEntity.TargetAndTypeId;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteServiceImpl; import org.alfresco.repo.site.SiteServiceImpl;
import org.alfresco.service.cmr.discussion.DiscussionService; import org.alfresco.service.cmr.discussion.DiscussionService;
import org.alfresco.service.cmr.discussion.PostInfo; import org.alfresco.service.cmr.discussion.PostInfo;
@@ -283,7 +284,7 @@ public class DiscussionServiceImpl implements DiscussionService
@Override @Override
public TopicInfo createTopic(String siteShortName, String title) public TopicInfo createTopic(final String siteShortName, final String title)
{ {
// Grab the location to store in // Grab the location to store in
NodeRef container = getSiteDiscussionsContainer(siteShortName, true); NodeRef container = getSiteDiscussionsContainer(siteShortName, true);
@@ -293,7 +294,7 @@ public class DiscussionServiceImpl implements DiscussionService
} }
@Override @Override
public TopicInfo createTopic(NodeRef parentNodeRef, String title) public TopicInfo createTopic(final NodeRef parentNodeRef, final String title)
{ {
// Build the name // Build the name
String name = generateName(); String name = generateName();
@@ -312,6 +313,21 @@ public class DiscussionServiceImpl implements DiscussionService
props props
).getChildRef(); ).getChildRef();
// We require that the parent container of the topic
// is always a tag scope. This should always be the case
// for site containers, but perhaps not others
if(! taggingService.isTagScope(parentNodeRef))
{
AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Void>() {
public Void doWork() throws Exception
{
// Add the tag scope aspect
taggingService.addTagScope(parentNodeRef);
return null;
}
}, AuthenticationUtil.getSystemUserName());
}
// Generate the wrapping object for it // Generate the wrapping object for it
// Build it that way, so creator and created date come through // Build it that way, so creator and created date come through
return buildTopic(nodeRef, parentNodeRef, name); return buildTopic(nodeRef, parentNodeRef, name);
@@ -875,8 +891,15 @@ public class DiscussionServiceImpl implements DiscussionService
@Override @Override
public Pair<Integer, Integer> getTotalResultCount() { public Pair<Integer, Integer> getTotalResultCount() {
int skipCount = finalLuceneResults.getStart(); int skipCount = 0;
int itemsRemainingAfterThisPage = finalLuceneResults.length(); int itemsRemainingAfterThisPage = 0;
try
{
skipCount = finalLuceneResults.getStart();
itemsRemainingAfterThisPage = finalLuceneResults.length();
}
catch(UnsupportedOperationException e) {}
final int totalItemsInUnpagedResultSet = skipCount + itemsRemainingAfterThisPage; final int totalItemsInUnpagedResultSet = skipCount + itemsRemainingAfterThisPage;
return new Pair<Integer, Integer>(totalItemsInUnpagedResultSet, totalItemsInUnpagedResultSet); return new Pair<Integer, Integer>(totalItemsInUnpagedResultSet, totalItemsInUnpagedResultSet);
} }

194
source/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java
View File

@@ -1114,20 +1114,21 @@ public class DiscussionServiceImplTest
/** /**
* Checks that the correct permission checking occurs on fetching * Checks that the correct permission checking occurs on fetching
* links listings (which go through canned queries) * topic and post listings (which go through canned queries)
* TODO
*/ */
/*
@Test public void discussionsListingPermissionsChecking() throws Exception @Test public void discussionsListingPermissionsChecking() throws Exception
{ {
PagingRequest paging = new PagingRequest(10); PagingRequest paging = new PagingRequest(10);
PagingResults<WikiPageInfo> results; PagingResults<TopicInfo> topics;
PagingResults<PostInfo> posts;
// Nothing to start with in either site // Nothing to start with in either site or on the node
results = DISCUSSION_SERVICE.listWikiPages(DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(DISCUSSION_SITE.getShortName(), paging);
assertEquals(0, results.getPage().size()); assertEquals(0, topics.getPage().size());
results = DISCUSSION_SERVICE.listWikiPages(ALTERNATE_DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(ALTERNATE_DISCUSSION_SITE.getShortName(), paging);
assertEquals(0, results.getPage().size()); assertEquals(0, topics.getPage().size());
topics = DISCUSSION_SERVICE.listTopics(FORUM_NODE, paging);
assertEquals(0, topics.getPage().size());
// Double check that we're only allowed to see the 1st site // Double check that we're only allowed to see the 1st site
assertEquals(true, SITE_SERVICE.isMember(DISCUSSION_SITE.getShortName(), TEST_USER)); assertEquals(true, SITE_SERVICE.isMember(DISCUSSION_SITE.getShortName(), TEST_USER));
@@ -1138,39 +1139,51 @@ public class DiscussionServiceImplTest
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
// Add two events to one site and three to the other // Add Topics to the two sites and the test node
// Note - add the events as a different user for the site that the // Note - add the events as a different user for the site that the
// test user isn't a member of! // test user isn't a member of!
WikiPageInfo pageA = DISCUSSION_SERVICE.createWikiPage( TopicInfo topicSA = DISCUSSION_SERVICE.createTopic(
DISCUSSION_SITE.getShortName(), "TitleA", "ContentA" DISCUSSION_SITE.getShortName(), "Title1A"
); );
WikiPageInfo pageB = DISCUSSION_SERVICE.createWikiPage( TopicInfo topicSB = DISCUSSION_SERVICE.createTopic(
DISCUSSION_SITE.getShortName(), "TitleB", "ContentB" DISCUSSION_SITE.getShortName(), "Title1B"
); );
testNodesToTidy.add(pageA.getNodeRef()); testNodesToTidy.add(topicSA.getNodeRef());
testNodesToTidy.add(pageB.getNodeRef()); testNodesToTidy.add(topicSB.getNodeRef());
AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER);
WikiPageInfo pagePrivA = DISCUSSION_SERVICE.createWikiPage( TopicInfo topicPrivA = DISCUSSION_SERVICE.createTopic(
ALTERNATE_DISCUSSION_SITE.getShortName(), "PrivTitleA", "Contents A" ALTERNATE_DISCUSSION_SITE.getShortName(), "PrivTitleA"
); );
WikiPageInfo pagePrivB = DISCUSSION_SERVICE.createWikiPage( TopicInfo topicPrivB = DISCUSSION_SERVICE.createTopic(
ALTERNATE_DISCUSSION_SITE.getShortName(), "PrivTitleB", "Contents B" ALTERNATE_DISCUSSION_SITE.getShortName(), "PrivTitleB"
); );
WikiPageInfo pagePrivC = DISCUSSION_SERVICE.createWikiPage( TopicInfo topicPrivC = DISCUSSION_SERVICE.createTopic(
ALTERNATE_DISCUSSION_SITE.getShortName(), "PrivTitleC", "Contents C" ALTERNATE_DISCUSSION_SITE.getShortName(), "PrivTitleC"
); );
testNodesToTidy.add(pagePrivA.getNodeRef()); testNodesToTidy.add(topicPrivA.getNodeRef());
testNodesToTidy.add(pagePrivB.getNodeRef()); testNodesToTidy.add(topicPrivB.getNodeRef());
testNodesToTidy.add(pagePrivC.getNodeRef()); testNodesToTidy.add(topicPrivC.getNodeRef());
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER); AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
TopicInfo topicNA = DISCUSSION_SERVICE.createTopic(
FORUM_NODE, "TitleNA"
);
AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER);
TopicInfo topicNB = DISCUSSION_SERVICE.createTopic(
FORUM_NODE, "TitleNB"
);
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
testNodesToTidy.add(topicNA.getNodeRef());
testNodesToTidy.add(topicNB.getNodeRef());
// Check again, as we're not in the 2nd site won't see any there // Check again, as we're not in the 2nd site won't see any there
results = DISCUSSION_SERVICE.listWikiPages(DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(DISCUSSION_SITE.getShortName(), paging);
assertEquals(2, results.getPage().size()); assertEquals(2, topics.getPage().size());
results = DISCUSSION_SERVICE.listWikiPages(ALTERNATE_DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(ALTERNATE_DISCUSSION_SITE.getShortName(), paging);
assertEquals(0, results.getPage().size()); assertEquals(0, topics.getPage().size());
topics = DISCUSSION_SERVICE.listTopics(FORUM_NODE, paging);
assertEquals(2, topics.getPage().size());
// Join the site, now we can see both // Join the site, now we can see both
@@ -1186,23 +1199,90 @@ public class DiscussionServiceImplTest
} }
}); });
results = DISCUSSION_SERVICE.listWikiPages(DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(DISCUSSION_SITE.getShortName(), paging);
assertEquals(2, results.getPage().size()); assertEquals(2, topics.getPage().size());
results = DISCUSSION_SERVICE.listWikiPages(ALTERNATE_DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(ALTERNATE_DISCUSSION_SITE.getShortName(), paging);
assertEquals(3, results.getPage().size()); assertEquals(3, topics.getPage().size());
topics = DISCUSSION_SERVICE.listTopics(FORUM_NODE, paging);
assertEquals(2, topics.getPage().size());
// Explicitly remove their permissions from one node, check it vanishes from the list // Explicitly remove their permissions from one node on each,
PERMISSION_SERVICE.setInheritParentPermissions(pagePrivC.getNodeRef(), false); // check it vanishes from the list
PERMISSION_SERVICE.clearPermission(pagePrivC.getNodeRef(), TEST_USER); PERMISSION_SERVICE.setInheritParentPermissions(topicPrivC.getNodeRef(), false);
PERMISSION_SERVICE.clearPermission(topicPrivC.getNodeRef(), TEST_USER);
PERMISSION_SERVICE.setInheritParentPermissions(topicNB.getNodeRef(), false);
PERMISSION_SERVICE.clearPermission(topicNB.getNodeRef(), TEST_USER);
results = DISCUSSION_SERVICE.listWikiPages(DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(DISCUSSION_SITE.getShortName(), paging);
assertEquals(2, results.getPage().size()); assertEquals(2, topics.getPage().size());
results = DISCUSSION_SERVICE.listWikiPages(ALTERNATE_DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(ALTERNATE_DISCUSSION_SITE.getShortName(), paging);
assertEquals(2, results.getPage().size()); assertEquals(2, topics.getPage().size());
topics = DISCUSSION_SERVICE.listTopics(FORUM_NODE, paging);
assertEquals(1, topics.getPage().size());
// Leave, they go away again // Create a primary post on each topic
AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER);
DISCUSSION_SERVICE.createPost(topicSA, "Test S Post");
DISCUSSION_SERVICE.createPost(topicSB, "Test S Post");
DISCUSSION_SERVICE.createPost(topicPrivA, "Test P Post");
DISCUSSION_SERVICE.createPost(topicPrivB, "Test P Post");
DISCUSSION_SERVICE.createPost(topicPrivC, "Test P Post");
DISCUSSION_SERVICE.createPost(topicNA, "Test N Post");
DISCUSSION_SERVICE.createPost(topicNB, "Test N Post");
AuthenticationUtil.setFullyAuthenticatedUser(TEST_USER);
// Check we see the primary post everywhere we can see the node
posts = DISCUSSION_SERVICE.listPosts(topicSA, paging);
assertEquals(1, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicSB, paging);
assertEquals(1, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicPrivA, paging);
assertEquals(1, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicPrivB, paging);
assertEquals(1, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicPrivC, paging);
assertEquals(0, posts.getPage().size()); // Topic hidden
posts = DISCUSSION_SERVICE.listPosts(topicNA, paging);
assertEquals(1, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicNB, paging);
assertEquals(0, posts.getPage().size()); // Topic hidden
// Remove permissions from some posts, check they vanish
PostInfo ppSA = DISCUSSION_SERVICE.getPrimaryPost(topicSA);
PERMISSION_SERVICE.setInheritParentPermissions(ppSA.getNodeRef(), false);
PERMISSION_SERVICE.clearPermission(ppSA.getNodeRef(), TEST_USER);
PostInfo ppPA = DISCUSSION_SERVICE.getPrimaryPost(topicPrivA);
PERMISSION_SERVICE.setInheritParentPermissions(ppPA.getNodeRef(), false);
PERMISSION_SERVICE.clearPermission(ppPA.getNodeRef(), TEST_USER);
PostInfo ppNA = DISCUSSION_SERVICE.getPrimaryPost(topicNA);
PERMISSION_SERVICE.setInheritParentPermissions(ppNA.getNodeRef(), false);
PERMISSION_SERVICE.clearPermission(ppNA.getNodeRef(), TEST_USER);
posts = DISCUSSION_SERVICE.listPosts(topicSA, paging);
assertEquals(0, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicSB, paging);
assertEquals(1, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicPrivA, paging);
assertEquals(0, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicPrivB, paging);
assertEquals(1, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicPrivC, paging);
assertEquals(0, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicNA, paging);
assertEquals(0, posts.getPage().size());
posts = DISCUSSION_SERVICE.listPosts(topicNB, paging);
assertEquals(0, posts.getPage().size());
// Leave, the site, they go away again
TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>() TRANSACTION_HELPER.doInTransaction(new RetryingTransactionHelper.RetryingTransactionCallback<Void>()
{ {
@Override @Override
@@ -1215,27 +1295,33 @@ public class DiscussionServiceImplTest
} }
}); });
results = DISCUSSION_SERVICE.listWikiPages(DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(DISCUSSION_SITE.getShortName(), paging);
assertEquals(2, results.getPage().size()); assertEquals(2, topics.getPage().size());
results = DISCUSSION_SERVICE.listWikiPages(ALTERNATE_DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(ALTERNATE_DISCUSSION_SITE.getShortName(), paging);
assertEquals(0, results.getPage().size()); assertEquals(0, topics.getPage().size());
topics = DISCUSSION_SERVICE.listTopics(FORUM_NODE, paging);
assertEquals(1, topics.getPage().size());
// Tidy // Tidy
paging = new PagingRequest(10); paging = new PagingRequest(10);
AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER); AuthenticationUtil.setFullyAuthenticatedUser(ADMIN_USER);
results = DISCUSSION_SERVICE.listWikiPages(DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(DISCUSSION_SITE.getShortName(), paging);
for(WikiPageInfo link : results.getPage()) for(TopicInfo topic : topics.getPage())
{ {
PUBLIC_NODE_SERVICE.deleteNode(link.getNodeRef()); PUBLIC_NODE_SERVICE.deleteNode(topic.getNodeRef());
} }
results = DISCUSSION_SERVICE.listWikiPages(ALTERNATE_DISCUSSION_SITE.getShortName(), paging); topics = DISCUSSION_SERVICE.listTopics(ALTERNATE_DISCUSSION_SITE.getShortName(), paging);
for(WikiPageInfo link : results.getPage()) for(TopicInfo topic : topics.getPage())
{ {
PUBLIC_NODE_SERVICE.deleteNode(link.getNodeRef()); PUBLIC_NODE_SERVICE.deleteNode(topic.getNodeRef());
}
topics = DISCUSSION_SERVICE.listTopics(FORUM_NODE, paging);
for(TopicInfo topic : topics.getPage())
{
PUBLIC_NODE_SERVICE.deleteNode(topic.getNodeRef());
} }
} }
*/
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------