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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
60593: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60361: Merged DEV to V4.2-BUG-FIX (4.2.2)
         58110: Added missing transaction in ActivityServiceImplTest (MNT-9806)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 14:08:00 +00:00
parent 74f7a1d3a6
commit db883205f8
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/test-java/org/alfresco/repo/activities/ActivityServiceImplTest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2012 Alfresco Software Limited. * Copyright (C) 2005-2014 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -29,6 +29,7 @@ import org.alfresco.repo.domain.activities.ActivityPostEntity;
import org.alfresco.repo.jscript.ClasspathScriptLocation; import org.alfresco.repo.jscript.ClasspathScriptLocation;
import org.alfresco.repo.node.archive.NodeArchiveService; import org.alfresco.repo.node.archive.NodeArchiveService;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.activities.ActivityService; import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.activities.FeedControl; import org.alfresco.service.cmr.activities.FeedControl;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -38,6 +39,7 @@ import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService; 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.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory; import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@@ -58,6 +60,7 @@ public class ActivityServiceImplTest extends TestCase
private ScriptService scriptService; private ScriptService scriptService;
private MutableAuthenticationService authenticationService; private MutableAuthenticationService authenticationService;
private SiteService siteService; private SiteService siteService;
private TransactionService transactionService;
private ActivityPostDAO postDAO; private ActivityPostDAO postDAO;
private NodeArchiveService nodeArchiveService; private NodeArchiveService nodeArchiveService;
@@ -75,6 +78,7 @@ public class ActivityServiceImplTest extends TestCase
scriptService = (ScriptService)ctx.getBean("ScriptService"); scriptService = (ScriptService)ctx.getBean("ScriptService");
siteService = (SiteService)ctx.getBean("SiteService"); siteService = (SiteService)ctx.getBean("SiteService");
nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService"); nodeArchiveService = (NodeArchiveService)ctx.getBean("nodeArchiveService");
transactionService = (TransactionService)ctx.getBean("TransactionService");
postDAO = (ActivityPostDAO)ctx.getBean("postDAO"); postDAO = (ActivityPostDAO)ctx.getBean("postDAO");
@@ -142,10 +146,18 @@ public class ActivityServiceImplTest extends TestCase
authenticationService.authenticate(USER_UN, USER_PW.toCharArray()); authenticationService.authenticate(USER_UN, USER_PW.toCharArray());
String siteId = "emptySite-"+TEST_RUN_ID; final String siteId = "emptySite-"+TEST_RUN_ID;
siteService.createSite("mypreset", siteId, "empty site title", "empty site description", SiteVisibility.PUBLIC); siteService.createSite("mypreset", siteId, "empty site title", "empty site description", SiteVisibility.PUBLIC);
List<String> siteFeedEntries = activityService.getSiteFeedEntries(siteId); RetryingTransactionCallback<List<String>> getEntriesCallback = new RetryingTransactionCallback<List<String>>()
{
@Override
public List<String> execute() throws Throwable
{
return activityService.getSiteFeedEntries(siteId);
}
};
List<String> siteFeedEntries = transactionService.getRetryingTransactionHelper().doInTransaction(getEntriesCallback);
assertNotNull(siteFeedEntries); assertNotNull(siteFeedEntries);
assertTrue(siteFeedEntries.isEmpty()); assertTrue(siteFeedEntries.isEmpty());