inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.3) to 5.2.N (5.2.1)

Browse Source 
135137 cpopa: Merged WEBAPP-API (5.2.1) to 5.1.N (5.1.3)
      135050 cpopa: MNT-17341 : External users with Manager role cannot invite other external users to the site because site invitation accept fails
         - Enabled test ActivitiInvitationServiceImplTests by adding it to AllUnitTestsSuite
         - Fixed a couple of failing tests from ActivitiInvitationServiceImplTests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135147 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Constantin Popa
2017-02-14 16:28:30 +00:00
parent 80586e5a72
commit ff91dc2cbb
3 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
View File

@@ -47,6 +47,7 @@ import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.workflow.WorkflowAdminServiceImpl;
import org.alfresco.service.cmr.invitation.Invitation;
import org.alfresco.service.cmr.invitation.Invitation.ResourceType;
import org.alfresco.service.cmr.invitation.InvitationExceptionUserError;
import org.alfresco.service.cmr.invitation.InvitationSearchCriteria;
import org.alfresco.service.cmr.invitation.InvitationService;
import org.alfresco.service.cmr.invitation.ModeratedInvitation;
@@ -63,6 +64,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.util.ReflectionUtils;
/**
* Unit tests of Invitation Service
*/
@@ -230,11 +232,16 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
this.authenticationComponent.setCurrentUser(USER_MANAGER);
// Invite our existing user
NominatedInvitation nominatedInvitation = invitationService.inviteNominated(
inviteeUserName, resourceType, resourceName, inviteeRole, acceptUrl, rejectUrl);
// Cancel the invite
invitationService.cancel(nominatedInvitation.getInviteId());
try
{
invitationService.inviteNominated(inviteeUserName, resourceType, resourceName, inviteeRole, acceptUrl, rejectUrl);
fail("An exception of type " + InvitationExceptionUserError.class.getName() + " should be thrown");
}
catch (Exception ex)
{
assertTrue("Incorrect exception was thrown", ex instanceof InvitationExceptionUserError);
}
// Our User and associated Authentication still exists
assertNotNull("User Exists", personService.getPersonOrNull(USER_ONE));
@@ -416,7 +423,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
* Check that system generated invitations can work as well
*/
{
Field faf = mailService.getClass().getDeclaredField("fromAddress");
Field faf = mailService.getClass().getDeclaredField("fromDefaultAddress");
faf.setAccessible(true);
String defaultFromAddress = (String)ReflectionUtils.getField(faf, mailService);
@@ -1156,25 +1163,24 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
invitationService.inviteModerated(comments, USER_TWO, resourceType, SITE_SHORT_NAME_RED, inviteeRole);
/**
* Search for invitations for BLUE
* Search for invitations for BLUE - no pending invite since the user is added directly without waiting for the user to accept it
*/
List<Invitation> resOne = invitationService.listPendingInvitationsForResource(ResourceType.WEB_SITE,
SITE_SHORT_NAME_BLUE);
assertEquals("blue invites not 1", 1, resOne.size());
assertEquals("blue id wrong", threeId, resOne.get(0).getInviteId());
assertEquals("blue invites not 0", 0, resOne.size());
/**
* Search for invitations for RED
* Search for invitations for RED - no pending nominated invites since the user is added directly without waiting for the user to accept it
*/
List<Invitation> resTwo = invitationService.listPendingInvitationsForResource(ResourceType.WEB_SITE,
SITE_SHORT_NAME_RED);
assertEquals("red invites not 3", 3, resTwo.size());
assertEquals("red invites not 2", 2, resTwo.size());
/**
* Search for invitations for USER_ONE
*/
List<Invitation> resThree = invitationService.listPendingInvitationsForInvitee(USER_ONE);
assertEquals("user one does not have 3 invitations", 3, resThree.size());
assertEquals("user one does not have 1 invitations", 1, resThree.size());
/**
* Search for invitations for USER_TWO
@@ -1190,33 +1196,33 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
crit1.setInvitationType(InvitationSearchCriteria.InvitationType.NOMINATED);
List<Invitation> resFive = invitationService.searchInvitation(crit1);
assertEquals("user one does not have 2 nominated", 2, resFive.size());
assertEquals("user one should not have any nominated invites", 0, resFive.size());
// now limit the search to 1 returned value
List<Invitation> limitRes = invitationService.searchInvitation(crit1, 1);
assertEquals("user one does not have 1 nominated", 1, limitRes.size());
assertEquals("user one should not have any nominated invites", 0, limitRes.size());
/**
* Search with an empty criteria - should find all open invitations
*/
InvitationSearchCriteria crit2 = new InvitationSearchCriteriaImpl();
invitationService.searchInvitation(crit2);
assertTrue("search everything returned 0 elements", resFive.size() > 0);
List<Invitation> searchInvitation = invitationService.searchInvitation(crit2);
assertTrue("2 moderated invitations should be found", searchInvitation.size() == 2);
// now search everything but limit the results to 3
invitationService.searchInvitation(crit2, 3);
assertTrue("search everything returned 0 or more than 3 elements", resFive.size() > 0 && resFive.size() <=3);
searchInvitation = invitationService.searchInvitation(crit2, 2);
assertTrue("search everything returned 0 or more than 2 elements", searchInvitation.size() > 0 && searchInvitation.size() <=2);
InvitationSearchCriteriaImpl crit3 = new InvitationSearchCriteriaImpl();
crit3.setInviter(USER_MANAGER);
crit3.setInvitationType(InvitationSearchCriteria.InvitationType.NOMINATED);
List<Invitation> res3 = invitationService.searchInvitation(crit3);
assertEquals("user one does not have 2 nominated", 2, res3.size());
assertEquals("user one should not have any nominated invites", 0, res3.size());
//now limit the search to 1 result
res3 = invitationService.searchInvitation(crit3, 1);
assertEquals("user one does not have 1 nominated", 1, res3.size());
assertEquals("user one should not have any nominated invites", 0, res3.size());
}
/**