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

Audit changes and fixes

Browse Source 
- Removed notion of audit session
 - Removed 'scope' attribute for DataGenerator elements
 - Removed alf_audit_session table and replaced with alf_audit_app (see script)
 - DataGenerators are working properly


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-09-02 14:45:23 +00:00
parent 381d7730c5
commit 2cdc1777f9
30 changed files with 448 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,11 +110,11 @@ public class AuditComponentTest extends TestCase
// Just here to fail if the basic startup fails
}
public void testStartSessionWithBadPath() throws Exception
public void testAuditWithBadPath() throws Exception
{
try
{
auditComponent.startAuditSession(APPLICATION_TEST, "test");
auditComponent.audit(APPLICATION_TEST, "/test", null);
fail("Should fail due to lack of a transaction.");
}
catch (IllegalStateException e)
@@ -127,7 +127,7 @@ public class AuditComponentTest extends TestCase
{
try
{
auditComponent.startAuditSession(APPLICATION_TEST, "test");
auditComponent.audit(APPLICATION_TEST, "test", null);
fail("Failed to detect illegal path");
}
catch (AuditModelException e)
@@ -136,18 +136,16 @@ public class AuditComponentTest extends TestCase
}
try
{
auditComponent.startAuditSession(APPLICATION_TEST, "/test/");
auditComponent.audit(APPLICATION_TEST, "/test/", null);
fail("Failed to detect illegal path");
}
catch (AuditModelException e)
{
// Expected
}
AuditSession session;
session = auditComponent.startAuditSession("Bogus App", "/test");
assertNull("Invalid app should return null session.", session);
session = auditComponent.startAuditSession(APPLICATION_TEST, "/test");
assertNotNull("Valid app and root path failed to create session.", session);
Map<String, Serializable> auditedValues = auditComponent.audit("Bogus App", "/test", null);
assertNotNull(auditedValues);
assertTrue("Invalid application should not audit anything", auditedValues.isEmpty());
return null;
}
@@ -158,20 +156,18 @@ public class AuditComponentTest extends TestCase
/**
* Start a session and use it within a single txn
*/
public void testSession_Basic() throws Exception
public void testAudit_Basic() throws Exception
{
final RetryingTransactionCallback<Void> testCallback = new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
AuditSession session = auditComponent.startAuditSession(APPLICATION_TEST, "/test/1.1");
Map<String, Serializable> values = new HashMap<String, Serializable>(13);
values.put("/test/1.1/2.1/3.1/4.1", new Long(41));
values.put("/test/1.1/2.1/3.1/4.2", "42");
values.put("/test/1.1/2.1/3.1/4.2", new Date());
auditComponent.audit(session, values);
auditComponent.audit(APPLICATION_TEST, "/test/1.1", values);
return null;
}
@@ -198,7 +194,7 @@ public class AuditComponentTest extends TestCase
for (Map.Entry<String, Serializable> entry : parameters.entrySet())
{
String paramName = entry.getKey();
String path = AuditApplication.buildPath("params", paramName);
String path = AuditApplication.buildPath(action, "params", paramName);
adjustedValues.put(path, entry.getValue());
}
@@ -207,10 +203,9 @@ public class AuditComponentTest extends TestCase
{
public Map<String, Serializable> execute() throws Throwable
{
String actionPath = AuditApplication.buildPath("actions-test/actions", action);
AuditSession session = auditComponent.startAuditSession(APPLICATION_ACTIONS_TEST, actionPath);
String actionPath = AuditApplication.buildPath("actions-test/actions");
return auditComponent.audit(session, adjustedValues);
return auditComponent.audit(APPLICATION_ACTIONS_TEST, actionPath, adjustedValues);
}
};
return transactionService.getRetryingTransactionHelper().doInTransaction(auditCallback);
@@ -279,7 +274,8 @@ public class AuditComponentTest extends TestCase
Map<String, Serializable> result = auditTestAction("action-01", nodeRef, parameters);
Map<String, Serializable> expected = new HashMap<String, Serializable>();
expected.put("/actions-test/actions/action-01/context-node/noderef", nodeRef);
expected.put("/actions-test/actions/user", AuthenticationUtil.getFullyAuthenticatedUser());
expected.put("/actions-test/actions/context-node/noderef", nodeRef);
expected.put("/actions-test/actions/action-01/params/A/value", valueA);
expected.put("/actions-test/actions/action-01/params/B/value", valueB);
expected.put("/actions-test/actions/action-01/params/C/value", valueC);