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 More on unit tests for the new Discussions Service

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-08-12 14:32:44 +00:00
parent 0a7ef76f27
commit 44d9f3c66c
3 changed files with 1053 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/discussions-services-context.xml
View File

@@ -40,7 +40,6 @@
</bean> </bean>
<!-- The regular GetChildren Auditable Canned Query Factory --> <!-- The regular GetChildren Auditable Canned Query Factory -->
<!--
<bean name="discussionGetChildrenCannedQueryFactory" class="org.alfresco.repo.node.getchildren.GetChildrenAuditableCannedQueryFactory"> <bean name="discussionGetChildrenCannedQueryFactory" class="org.alfresco.repo.node.getchildren.GetChildrenAuditableCannedQueryFactory">
<property name="registry" ref="discussionCannedQueryRegistry"/> <property name="registry" ref="discussionCannedQueryRegistry"/>
<property name="tenantService" ref="tenantService"/> <property name="tenantService" ref="tenantService"/>
@@ -49,7 +48,6 @@
<property name="cannedQueryDAO" ref="cannedQueryDAO"/> <property name="cannedQueryDAO" ref="cannedQueryDAO"/>
<property name="methodSecurity" ref="DiscussionService_security_listPosts"/> <property name="methodSecurity" ref="DiscussionService_security_listPosts"/>
</bean> </bean>
-->
<!-- Discussion Service base bean --> <!-- Discussion Service base bean -->
<bean id="discussionService" class="org.alfresco.repo.discussion.DiscussionServiceImpl"> <bean id="discussionService" class="org.alfresco.repo.discussion.DiscussionServiceImpl">

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

@@ -68,8 +68,7 @@ public class DiscussionServiceImpl implements DiscussionService
{ {
public static final String DISCUSSION_COMPONENT = "discussion"; public static final String DISCUSSION_COMPONENT = "discussion";
// TODO Correct CQ protected static final String CANNED_QUERY_GET_CHILDREN = "discussionGetChildrenCannedQueryFactory";
protected static final String CANNED_QUERY_GET_CHILDREN = "wikiGetChildrenCannedQueryFactory";
/** /**
* The logger * The logger
@@ -126,7 +125,7 @@ public class DiscussionServiceImpl implements DiscussionService
/** /**
* Fetches the Discussions Container on a site, creating as required if requested. * Fetches the Discussions Container on a site, creating as required if requested.
*/ */
protected NodeRef getSiteWikiContainer(final String siteShortName, boolean create) protected NodeRef getSiteDiscussionsContainer(final String siteShortName, boolean create)
{ {
return SiteServiceImpl.getSiteContainer( return SiteServiceImpl.getSiteContainer(
siteShortName, DISCUSSION_COMPONENT, create, siteShortName, DISCUSSION_COMPONENT, create,
@@ -213,7 +212,7 @@ public class DiscussionServiceImpl implements DiscussionService
@Override @Override
public TopicInfo getTopic(String siteShortName, String topicName) public TopicInfo getTopic(String siteShortName, String topicName)
{ {
NodeRef container = getSiteWikiContainer(siteShortName, false); NodeRef container = getSiteDiscussionsContainer(siteShortName, false);
if(container == null) if(container == null)
{ {
// No discussions // No discussions
@@ -258,7 +257,7 @@ public class DiscussionServiceImpl implements DiscussionService
public TopicInfo createTopic(String siteShortName, String title) public TopicInfo createTopic(String siteShortName, String title)
{ {
// Grab the location to store in // Grab the location to store in
NodeRef container = getSiteWikiContainer(siteShortName, true); NodeRef container = getSiteDiscussionsContainer(siteShortName, true);
// Add by Parent NodeRef // Add by Parent NodeRef
return createTopic(container, title); return createTopic(container, title);
@@ -435,7 +434,7 @@ public class DiscussionServiceImpl implements DiscussionService
public PagingResults<WikiPageInfo> listWikiPages(String siteShortName, String username, public PagingResults<WikiPageInfo> listWikiPages(String siteShortName, String username,
Date createdFrom, Date createdTo, Date modifiedFrom, Date modifiedTo, PagingRequest paging) Date createdFrom, Date createdTo, Date modifiedFrom, Date modifiedTo, PagingRequest paging)
{ {
NodeRef container = getSiteWikiContainer(siteShortName, false); NodeRef container = getSiteDiscussionsContainer(siteShortName, false);
if(container == null) if(container == null)
{ {
// No events // No events
@@ -526,7 +525,7 @@ public class DiscussionServiceImpl implements DiscussionService
@Override @Override
public PagingResults<TopicInfo> listTopics(String siteShortName, public PagingResults<TopicInfo> listTopics(String siteShortName,
PagingRequest paging) { PagingRequest paging) {
NodeRef container = getSiteWikiContainer(siteShortName, false); NodeRef container = getSiteDiscussionsContainer(siteShortName, false);
if(container == null) if(container == null)
{ {
// No topics // No topics

1047
source/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java Normal file
View File

File diff suppressed because it is too large Load Diff