From e18c35db1777b2647075fdf4a07746c8c51d8903 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 25 Jun 2015 08:28:36 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 107013: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) 106982: MNT-14113: User admin console: sorting users causes some to disappear Additional changes in 'org.alfresco.repo.web.scripts.invite.InviteServiceTest' to fix the https://bamboo.alfresco.com/bamboo/browse/ALF-ENT50-346 test failure git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107052 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/invite/InviteServiceTest.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java b/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java index f92e72e64b..ee8434ca9c 100644 --- a/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java +++ b/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -1027,7 +1027,6 @@ public class InviteServiceTest extends BaseWebScriptTest for (String user : allUsersArr) { final String userName = user; - ; // Create a person with a blank email address and AuthenticationUtil.runAs(new RunAsWork() @@ -1076,7 +1075,16 @@ public class InviteServiceTest extends BaseWebScriptTest } } } - assertEquals(3, siteUsers.size()); + + // MNT-14113: User admin console: sorting users causes some to disappear + // + // It was decided to make the search results of AFTS (indexed) search to be the + // same as the CQ search results. Therefore, 'People.getPeople(String filter)' + // transforms 'filter' to '**' (adds leading wildcard). + // 'InviterUser' is the creator of the test site (see the 'setUp()' method). + // Thus, plus one more user ('user1', 'user2', 'user3' and the creator + // 'InviterUser') + assertEquals(4, siteUsers.size()); // cancel invite different manager String inviteId = (String) collInv.get("inviteId");