Merge from V3.4 to HEAD r. xx (Part ONE)

r. 23839 Merge from V3.3-BUG-FIX to V3.4
    r.23837: Reimplementation of the build fix for InviteServiceTest. This one won't send emails.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2010-11-22 12:11:27 +00:00
parent acac6ddc44
commit 3b66f3fe90
2 changed files with 43 additions and 6 deletions

View File

@@ -88,12 +88,6 @@ public class SiteServiceTest extends BaseWebScriptTest
this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService");
// We're using a MailActionExecuter defined in outboundSMTP-test-context.xml which
// sets the testMode property to true via spring injection. This will prevent emails
// from being sent from within this test case.
// This MailExecutorAction bean is named "test-mail" but is in all other respects equivalent to the
// 'real' executer bean. It is automatically included during OutboundSMTP subsystem startup.
this.authenticationComponent.setSystemUserAsCurrentUser();
// Create users