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

Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1)

Browse Source 
135805 jkaabimofrad: fixed tests failures.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@135932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2017-03-16 19:39:37 +00:00
parent de94938b0d
commit 3053256b6f
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,7 @@ import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility; import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.BaseAlfrescoSpringTest; import org.alfresco.util.BaseAlfrescoSpringTest;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import org.alfresco.util.email.ExtendedMailActionExecutor;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils;
@@ -423,7 +424,15 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
* Check that system generated invitations can work as well * Check that system generated invitations can work as well
*/ */
{ {
Field faf = mailService.getClass().getDeclaredField("fromDefaultAddress"); Field faf;
if (mailService instanceof ExtendedMailActionExecutor)
{
faf = mailService.getClass().getSuperclass().getDeclaredField("fromDefaultAddress");
}
else
{
faf = mailService.getClass().getDeclaredField("fromDefaultAddress");
}
faf.setAccessible(true); faf.setAccessible(true);
String defaultFromAddress = (String) ReflectionUtils.getField(faf, mailService); String defaultFromAddress = (String) ReflectionUtils.getField(faf, mailService);

4
source/test-java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java
View File

@@ -473,8 +473,8 @@ public class ResetPasswordServiceImplTest
.setPassword("newPassword") .setPassword("newPassword")
.setWorkflowId(pair.getFirst()) .setWorkflowId(pair.getFirst())
.setWorkflowKey(pair.getSecond()); .setWorkflowKey(pair.getSecond());
// Wait for 4 seconds, so the end timer expires! // Wait for 5 seconds, so the end timer expires!
Thread.sleep(4000); Thread.sleep(5000);
try try
{ {
resetPasswordService.initiateResetPassword(passwordDetails); resetPasswordService.initiateResetPassword(passwordDetails);

2
source/test-resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties
View File

@@ -8,5 +8,5 @@ mail.from.default=alfresco@test-alfresco.org
mail.testmessage.send=false mail.testmessage.send=false
# validate email addresses # validate email addresses
mail.validate.addresses= false mail.validate.addresses= true
dev.email.not.sent=true dev.email.not.sent=true