Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

85568: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      85476: Merged DEV to V4.2-BUG-FIX
       84330 : MNT-11775 : The (reject) review comment value is never shown in a moderated site rejection email.
        Corrected invitation-moderated.bpmn20.xml file . 
       85450 : MNT-11775 : The (reject) review comment value is never shown in a moderated site rejection email.
        Corrected some unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 09:32:01 +00:00
parent 33cb8d37d6
commit 3eb7e5d52b
2 changed files with 6 additions and 6 deletions

View File

@@ -618,7 +618,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
try
{
invitationService.approve(invitationId, "Have I not rejected this?");
assertTrue("rejected invitation not working", false);
fail("rejected invitation not working");
}
catch (Exception e)
{
@@ -947,7 +947,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
try
{
invitationService.approve(invitationId, "No Way Hosea!");
assertTrue("excetion not thrown", false);
fail("excetion not thrown");
}
catch (Exception e)
@@ -976,7 +976,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
try
{
invitationService.approve(invitationId, "Have I not already done this?");
assertTrue("duplicate approve excetion not thrown", false);
fail("duplicate approve excetion not thrown");
}
catch (Exception e)
{
@@ -1016,7 +1016,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
try
{
invitationService.reject(invitationId, "No Way Hosea!");
assertTrue("excetion not thrown", false);
fail("excetion not thrown");
}
catch (Exception e)
@@ -1038,7 +1038,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
try
{
invitationService.approve(invitationId, "Have I not rejected this?");
assertTrue("rejected invitation not working", false);
fail("rejected invitation not working");
}
catch (Exception e)
{