diff --git a/source/test-java/org/alfresco/cmis/changelog/CMISChangeLogServiceTest.java b/source/test-java/org/alfresco/cmis/changelog/CMISChangeLogServiceTest.java index f4b0de8c2d..bc6d3976ff 100644 --- a/source/test-java/org/alfresco/cmis/changelog/CMISChangeLogServiceTest.java +++ b/source/test-java/org/alfresco/cmis/changelog/CMISChangeLogServiceTest.java @@ -38,6 +38,9 @@ import org.alfresco.cmis.CMISChangeType; import org.alfresco.cmis.CMISInvalidArgumentException; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; +import org.alfresco.repo.audit.AuditComponent; +import org.alfresco.repo.audit.AuditServiceImpl; +import org.alfresco.repo.audit.UserAuditFilter; import org.alfresco.repo.audit.model.AuditModelRegistryImpl; import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationUtil; @@ -433,6 +436,14 @@ public class CMISChangeLogServiceTest extends TestCase transactionService = (TransactionService) applicationContext.getBean("transactionComponent"); authenticationComponent = (AuthenticationComponent) applicationContext.getBean("authenticationComponent"); retryingTransactionHelper = (RetryingTransactionHelper) applicationContext.getBean("retryingTransactionHelper"); + //MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user + UserAuditFilter userAuditFilter = new UserAuditFilter(); + userAuditFilter.setUserFilterPattern("System;.*"); + userAuditFilter.afterPropertiesSet(); + AuditComponent auditComponent = (AuditComponent) applicationContext.getBean("auditComponent"); + auditComponent.setUserAuditFilter(userAuditFilter); + AuditServiceImpl auditServiceImpl = (AuditServiceImpl) applicationContext.getBean("auditService"); + auditServiceImpl.setAuditComponent(auditComponent); auditSubsystem = (AuditModelRegistryImpl) applicationContext.getBean("Audit"); // initialise audit subsystem diff --git a/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java b/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java index c21e785113..0f854d7fca 100644 --- a/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java +++ b/source/test-java/org/alfresco/repo/web/scripts/audit/AuditWebScriptTest.java @@ -22,6 +22,9 @@ import java.net.URL; import java.util.Date; import java.util.Map; +import org.alfresco.repo.audit.AuditComponent; +import org.alfresco.repo.audit.AuditServiceImpl; +import org.alfresco.repo.audit.UserAuditFilter; import org.alfresco.repo.audit.model.AuditModelRegistryImpl; import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.security.authentication.AuthenticationException; @@ -66,6 +69,14 @@ public class AuditWebScriptTest extends BaseWebScriptTest { super.setUp(); ctx = getServer().getApplicationContext(); + //MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user + UserAuditFilter userAuditFilter = new UserAuditFilter(); + userAuditFilter.setUserFilterPattern("System;.*"); + userAuditFilter.afterPropertiesSet(); + AuditComponent auditComponent = (AuditComponent) ctx.getBean("auditComponent"); + auditComponent.setUserAuditFilter(userAuditFilter); + AuditServiceImpl auditServiceImpl = (AuditServiceImpl) ctx.getBean("auditService"); + auditServiceImpl.setAuditComponent(auditComponent); authenticationService = (AuthenticationService) ctx.getBean("AuthenticationService"); auditService = (AuditService) ctx.getBean("AuditService"); admin = AuthenticationUtil.getAdminUserName();