Merged V4.1-BUG-FIX to HEAD

40283: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40281: ALF-4832: Fix unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-08-10 09:27:08 +00:00
parent cf2e12eebc
commit cb963a6def

View File

@@ -512,8 +512,8 @@ public class SiteActivityTest extends TestCase
getUserFeed(null, site3, false, false, false, 6);
getUserFeed(null, null, false, false, false, 14); // no filter
getUserFeed(null, null, false, true, false, 14); // exclude any from user1
getUserFeed(null, null, false, false, true, 0); // exclude all except user1
getUserFeed(null, null, false, true, false, 12); // exclude any from user1
getUserFeed(null, null, false, false, true, 2); // exclude all except user1
getUserFeed(null, null, false, true, true, 0); // exclude all (NOOP)
// TODO - add more (eg. other non-admin user activities)