Merged BRANCHES/V3.3 to HEAD:

20575: ALF-3179: Correction to handling of peer associations for which the transferred node is the target.
   20586: Fix ALF-2996
   20587: ALF-2627 - Share site activity feeds are not working for DB2 dialect
   20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
   20593: Further fix for ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
   20670: Fix for ALF-3260: XSS attack is made in Wiki tab if First/Last user name contain xss
   20671: Fixed ALF-3546: patch.db-V3.2-AddFKIndexes is failing on MSSQL Server 2008 on upgrade to 3.3.1 E build 95


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-06-17 10:24:31 +00:00
parent 4badee51e0
commit 6e928249a5
7 changed files with 118 additions and 6 deletions

View File

@@ -120,27 +120,27 @@ public class ActivityServiceImplTest extends BaseSpringTest
public void testGetEmptyUserFeed() throws Exception
{
List<String> userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "some format", null);
List<String> userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "a format", null);
assertNotNull(userFeedEntries);
assertTrue(userFeedEntries.isEmpty());
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "some format", "some site");
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "a format", "some site");
assertNotNull(userFeedEntries);
assertTrue(userFeedEntries.isEmpty());
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "some format", "some site", true, false);
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "a format", "some site", true, false);
assertNotNull(userFeedEntries);
assertTrue(userFeedEntries.isEmpty());
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "some format", "some site", false, true);
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "a format", "some site", false, true);
assertNotNull(userFeedEntries);
assertTrue(userFeedEntries.isEmpty());
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "some format", "some site", true, true);
userFeedEntries = this.activityService.getUserFeedEntries("unknown user", "a format", "some site", true, true);
assertNotNull(userFeedEntries);
assertTrue(userFeedEntries.isEmpty());