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

Code review changes

Browse Source
This commit is contained in:
Chris Shields
2019-11-20 11:16:04 +00:00
parent a8223fbae8
commit d8862b1ee3
2 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
View File

@@ -34,7 +34,6 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditEntry; import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditEntry;
@@ -510,8 +509,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
public void when() throws Exception public void when() throws Exception
{ {
// set the audit wuery param // set the audit wuery param
RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters(); RecordsManagementAuditQueryParameters params = createAuditQueryParameters(DELETE_USER_AUDIT_EVENT);
params.setEvent(DELETE_USER_AUDIT_EVENT);
// get the audit events for "Delete Person" // get the audit events for "Delete Person"
entry = getAuditTrail(params, 1, ADMIN_USER); entry = getAuditTrail(params, 1, ADMIN_USER);
@@ -566,8 +564,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
public void when() throws Exception public void when() throws Exception
{ {
// set the audit query param // set the audit query param
RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters(); RecordsManagementAuditQueryParameters params = createAuditQueryParameters(CREATE_USER_AUDIT_EVENT);
params.setEvent(CREATE_USER_AUDIT_EVENT);
// get the audit events for "Create Person" // get the audit events for "Create Person"
entry = getAuditTrail(params, 1, ADMIN_USER); entry = getAuditTrail(params, 1, ADMIN_USER);
@@ -950,13 +947,11 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
private RecordsManagementAuditEntry getAuditEntry(String auditEvent) private RecordsManagementAuditEntry getAuditEntry(String auditEvent)
{ {
// set the audit query param for the given event // create the audit query parameters for the given event
RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters(); RecordsManagementAuditQueryParameters params = createAuditQueryParameters(auditEvent);
params.setEvent(auditEvent);
// get the audit entries for the given event // get the audit entries for the given event
List<RecordsManagementAuditEntry> auditEntries; List<RecordsManagementAuditEntry> auditEntries = getAuditEntryAssertOnlyOne(params);
auditEntries = getAuditTrail(params, 1, ADMIN_USER);
// verify we have the expected audit event // verify we have the expected audit event
RecordsManagementAuditEntry auditEntry = auditEntries.get(0); RecordsManagementAuditEntry auditEntry = auditEntries.get(0);
@@ -966,17 +961,36 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
return auditEntry; return auditEntry;
} }
private List<RecordsManagementAuditEntry> getAuditEntryAssertOnlyOne(RecordsManagementAuditQueryParameters params)
{
List<RecordsManagementAuditEntry> auditEntries;
auditEntries = getAuditTrail(params, 1, ADMIN_USER);
return auditEntries;
}
private List<RecordsManagementAuditEntry> getAuditEntries(String auditEvent) private List<RecordsManagementAuditEntry> getAuditEntries(String auditEvent)
{ {
// set the audit query param for the given event // create the audit query parameters for the given event
RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters(); RecordsManagementAuditQueryParameters params = createAuditQueryParameters(auditEvent);
params.setEvent(auditEvent);
// get the audit entries for the given event // get the audit entries for the given event
List<RecordsManagementAuditEntry> auditEntries; List<RecordsManagementAuditEntry> auditEntries = getAllAuditEntries(params);
auditEntries = getAuditTrail(params, -1, ADMIN_USER);
return auditEntries; return auditEntries;
} }
private List<RecordsManagementAuditEntry> getAllAuditEntries(RecordsManagementAuditQueryParameters params)
{
List<RecordsManagementAuditEntry> auditEntries;
auditEntries = getAuditTrail(params, -1, ADMIN_USER);
return auditEntries;
}
private RecordsManagementAuditQueryParameters createAuditQueryParameters(String auditEvent)
{
RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters();
params.setEvent(auditEvent);
return params;
}
} }

1
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
View File

@@ -477,7 +477,6 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
verify(mockedNodeService, never()).removeChild(hold, recordFolder); verify(mockedNodeService, never()).removeChild(hold, recordFolder);
verify(mockedNodeService, never()).removeAspect(recordFolder, ASPECT_FROZEN); verify(mockedNodeService, never()).removeAspect(recordFolder, ASPECT_FROZEN);
verify(mockedNodeService, never()).removeAspect(record, ASPECT_FROZEN); verify(mockedNodeService, never()).removeAspect(record, ASPECT_FROZEN);
verify(mockedRecordsManagementAuditService, never()).auditEvent(eq(recordFolder), anyString());
} }
@Test @Test