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

ACE-2780: Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
85504: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
      << Build failure was fixed >>
      84534: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
         << Causes build problem with Cloud >>
         84123: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            83401: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4)
               83366: Merged DEV to V4.1-BUG-FIX (4.1.10)
                  82671 : MNT-12278 : Activity processing is single-threaded
                     - Refactoring for multithreading.
                  83343 : MNT-12278 : Activity processing is single-threaded
         84124: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            83678: MNT-12278 : Activity processing is single-threaded
               - Fixed build failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-09-23 16:10:34 +00:00
parent 85f1e5b819
commit df4b037784
5 changed files with 177 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/test-java/org/alfresco/repo/subscriptions/SubscriptionServiceActivitiesTest.java
View File

@@ -261,11 +261,18 @@ public class SubscriptionServiceActivitiesTest
feed = activityService.getUserFeedEntries(USER_TWO_NAME, null, false, false, null, null);
assertEquals(USER_TWO_NAME + " had wrong feed size.", 0, feed.size());
// userId1 + 5, userId2 + 0
generateFeed();
feed = activityService.getUserFeedEntries(USER_ONE_NAME, null, false, false, null, null);
return null;
}
});
// userId1 + 5, userId2 + 0
generateFeed();
doWorkAs(ADMIN, new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
List<String> feed = activityService.getUserFeedEntries(USER_ONE_NAME, null, false, false, null, null);
log.debug(USER_ONE_NAME + "'s feed: " + prettyJson(feed));
assertEquals(USER_ONE_NAME + " had wrong feed size", 5, feed.size());
@@ -299,13 +306,12 @@ public class SubscriptionServiceActivitiesTest
log.debug("And " + USER_TWO_NAME + " is now following " + USER_ONE_NAME);
// userId1 + 5, userId2 + 2
generateFeed();
doWorkAs(ADMIN, new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
// userId1 + 5, userId2 + 2
generateFeed();
List<String> feed = activityService.getUserFeedEntries(USER_ONE_NAME, null, false, false, null, null);
log.debug(USER_ONE_NAME + "'s feed: " + prettyJson(feed));
assertEquals(USER_ONE_NAME + "'s feed was wrong size", 7, feed.size());
@@ -333,13 +339,12 @@ public class SubscriptionServiceActivitiesTest
log.debug(USER_ONE_NAME + " added some content across the sites.");
// userId1 + 5, userId2 + 1
generateFeed();
doWorkAs(ADMIN, new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
// userId1 + 5, userId2 + 1
generateFeed();
List <String> feed = activityService.getUserFeedEntries(USER_ONE_NAME, null, false, false, null, null);
log.debug(USER_ONE_NAME + "'s feed: " + prettyJson(feed));
assertEquals(USER_ONE_NAME + "'s feed was wrong size", 12, feed.size());
@@ -353,11 +358,18 @@ public class SubscriptionServiceActivitiesTest
siteService.setMembership(modSite2.getShortName(), USER_TWO_NAME, SiteModel.SITE_MANAGER);
log.debug(USER_TWO_NAME + "'s role changed on some sites.");
// userId1 + 2, userId2 + 2
generateFeed();
feed = activityService.getUserFeedEntries(USER_ONE_NAME, null, false, false, null, null);
return null;
}
});
// userId1 + 2, userId2 + 2
generateFeed();
doWorkAs(ADMIN, new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
List <String> feed = activityService.getUserFeedEntries(USER_ONE_NAME, null, false, false, null, null);
log.debug(USER_ONE_NAME + "'s feed: " + prettyJson(feed));
assertEquals(USER_ONE_NAME + "'s feed was wrong size", 16, feed.size());
@@ -385,14 +397,12 @@ public class SubscriptionServiceActivitiesTest
log.debug(USER_ONE_NAME + " has added some more content...");
// userId1 + 5, userId2 + 3
generateFeed();
doWorkAs(ADMIN, new RetryingTransactionCallback<Void>()
{
@Override public Void execute() throws Throwable
{
// userId1 + 5, userId2 + 3
generateFeed();
List<String> feed = activityService.getUserFeedEntries(USER_ONE_NAME, null, false, false, null, null);
assertEquals("User's feed was wrong size", 21, feed.size());