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

Merge branch 'feature-2.3/RM-4307_AuditFix' into 'release/V2.3.1.x'

Browse Source 
Feature 2.3/rm 4307 audit fix

RM-4307 Cherry-pick fix from master.

See merge request !600
This commit is contained in:
Tom Page
2016-11-07 12:30:45 +00:00
parent ed69ffe7ed 4d511bd0af
commit ff27c94e25
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
View File

@@ -31,7 +31,7 @@ import org.alfresco.service.namespace.QName;
*/ */
public final class RecordsManagementAuditQueryParameters public final class RecordsManagementAuditQueryParameters
{ {
private int maxEntries = -1; private int maxEntries = Integer.MAX_VALUE;
private String user; private String user;
private NodeRef nodeRef; private NodeRef nodeRef;
private Date dateFrom; private Date dateFrom;

16
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
View File

@@ -162,9 +162,9 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
// "audit.start", "audit.view" and "Update RM Object"; // "audit.start", "audit.view" and "Update RM Object";
entries = getAuditTrail(3, ADMIN_USER); entries = getAuditTrail(3, ADMIN_USER);
assertEquals(entries.get(0).getEvent(), "audit.start"); assertEquals(entries.get(2).getEvent(), "audit.start");
assertEquals(entries.get(1).getEvent(), "audit.view"); assertEquals(entries.get(1).getEvent(), "audit.view");
assertEquals(entries.get(2).getEvent(), "Update RM Object"); assertEquals(entries.get(0).getEvent(), "Update RM Object");
// New "audit.view" event was generated - will be visible on next getAuditTrail(). // New "audit.view" event was generated - will be visible on next getAuditTrail().
@@ -176,14 +176,14 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
nodeService.deleteNode(record); nodeService.deleteNode(record);
List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER); List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER);
assertEquals(entries.get(0).getEvent(), "audit.start"); assertEquals(entries.get(4).getEvent(), "audit.start");
assertEquals(entries.get(1).getEvent(), "audit.view");
assertEquals(entries.get(2).getEvent(), "Update RM Object");
assertEquals(entries.get(3).getEvent(), "audit.view"); assertEquals(entries.get(3).getEvent(), "audit.view");
assertEquals(entries.get(2).getEvent(), "Update RM Object");
assertEquals(entries.get(1).getEvent(), "audit.view");
// Show the audit contains a reference to the deleted item: // Show the audit contains a reference to the deleted item:
assertEquals(entries.get(4).getEvent(), "Delete RM Object"); assertEquals(entries.get(0).getEvent(), "Delete RM Object");
assertEquals(entries.get(4).getNodeRef(), record); assertEquals(entries.get(0).getNodeRef(), record);
return null; return null;
} }
@@ -203,7 +203,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
// show the audit has been updated // show the audit has been updated
List<RecordsManagementAuditEntry> entries = getAuditTrail(3, ADMIN_USER); List<RecordsManagementAuditEntry> entries = getAuditTrail(3, ADMIN_USER);
final RecordsManagementAuditEntry entry = entries.get(2); final RecordsManagementAuditEntry entry = entries.get(0);
assertNotNull(entry); assertNotNull(entry);
// investigate the contents of the audit entry // investigate the contents of the audit entry