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

Added AuditService.clearAudit(List<Long>)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-10-08 09:26:34 +00:00
parent 6c8e135759
commit 6dcd5e5441
10 changed files with 168 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/repo/audit/AuditComponentTest.java
View File

@@ -523,7 +523,7 @@ public class AuditComponentTest extends TestCase
auditModelRegistry.registerModel(testModelUrl);
auditModelRegistry.loadAuditModels();
final List<Map<String, Serializable>> results = new ArrayList<Map<String,Serializable>>();
final List<Long> results = new ArrayList<Long>(5);
final StringBuilder sb = new StringBuilder();
AuditQueryCallback auditQueryCallback = new AuditQueryCallback()
{
@@ -539,7 +539,7 @@ public class AuditComponentTest extends TestCase
long time,
Map<String, Serializable> values)
{
results.add(values);
results.add(entryId);
if (logger.isDebugEnabled())
{
logger.debug(
@@ -615,11 +615,28 @@ public class AuditComponentTest extends TestCase
{
// Expected
}
try
{
authenticationService.authenticate("banana", "****".toCharArray());
fail("Invalid authentication attempt should fail");
}
catch (AuthenticationException e)
{
// Expected
}
results.clear();
sb.delete(0, sb.length());
queryAuditLog(auditQueryCallback, params, -1);
logger.debug(sb.toString());
assertFalse("Did not get any audit results after failed login", results.isEmpty());
assertEquals("Incorrect number of audit entries after failed login", 2, results.size());
// Check that we can delete explicit entries
deleteAuditEntries(results);
results.clear();
sb.delete(0, sb.length());
queryAuditLog(auditQueryCallback, params, -1);
logger.debug(sb.toString());
assertEquals("Explicit audit entries were not deleted", 0, results.size());
}
public void testAuditQuery_MaxId() throws Exception
@@ -677,6 +694,23 @@ public class AuditComponentTest extends TestCase
AuthenticationUtil.runAs(work, AuthenticationUtil.getAdminRoleName());
}
/**
* Clearn the audit log as 'admin'
*/
private void deleteAuditEntries(final List<Long> auditEntryIds)
{
RunAsWork<Void> work = new RunAsWork<Void>()
{
@Override
public Void doWork() throws Exception
{
auditService.clearAudit(auditEntryIds);
return null;
}
};
AuthenticationUtil.runAs(work, AuthenticationUtil.getAdminRoleName());
}
/**
* Clearn the audit log as 'admin'
*/