From d8862b1ee37be401f3f8d2fc010aa152f7c58730 Mon Sep 17 00:00:00 2001
From: Chris Shields <chris.shields@alfresco.com>
Date: Wed, 20 Nov 2019 11:16:04 +0000
Subject: [PATCH] Code review changes

---
 ...RecordsManagementAuditServiceImplTest.java | 44 ++++++++++++-------
 .../hold/HoldServiceImplUnitTest.java         |  1 -
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
index 6aee148602..6212c45b3f 100644
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
@@ -34,7 +34,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.audit.RecordsManagementAuditEntry;
@@ -510,8 +509,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
             public void when() throws Exception
             {
                 // set the audit wuery param
-                RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters();
-                params.setEvent(DELETE_USER_AUDIT_EVENT);
+                RecordsManagementAuditQueryParameters params = createAuditQueryParameters(DELETE_USER_AUDIT_EVENT);
 
                 // get the audit events for "Delete Person"
                 entry = getAuditTrail(params, 1, ADMIN_USER);
@@ -566,8 +564,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
             public void when() throws Exception
             {
                 // set the audit query param
-                RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters();
-                params.setEvent(CREATE_USER_AUDIT_EVENT);
+                RecordsManagementAuditQueryParameters params = createAuditQueryParameters(CREATE_USER_AUDIT_EVENT);
 
                 // get the audit events for "Create Person"
                 entry = getAuditTrail(params, 1, ADMIN_USER);
@@ -950,13 +947,11 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
 
     private RecordsManagementAuditEntry getAuditEntry(String auditEvent)
     {
-        // set the audit query param for the given event
-        RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters();
-        params.setEvent(auditEvent);
+        // create the audit query parameters for the given event
+        RecordsManagementAuditQueryParameters params = createAuditQueryParameters(auditEvent);
 
         // get the audit entries for the given event
-        List<RecordsManagementAuditEntry> auditEntries;
-        auditEntries = getAuditTrail(params, 1, ADMIN_USER);
+        List<RecordsManagementAuditEntry> auditEntries = getAuditEntryAssertOnlyOne(params);
 
         // verify we have the expected audit event
         RecordsManagementAuditEntry auditEntry = auditEntries.get(0);
@@ -966,17 +961,36 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
         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)
     {
-        // set the audit query param for the given event
-        RecordsManagementAuditQueryParameters params = new RecordsManagementAuditQueryParameters();
-        params.setEvent(auditEvent);
+        // create the audit query parameters for the given event
+        RecordsManagementAuditQueryParameters params = createAuditQueryParameters(auditEvent);
 
         // get the audit entries for the given event
-        List<RecordsManagementAuditEntry> auditEntries;
-        auditEntries = getAuditTrail(params, -1, ADMIN_USER);
+        List<RecordsManagementAuditEntry> auditEntries = getAllAuditEntries(params);
 
         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;
+    }
+
 }
diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
index f86b3efb90..9543a3a3c5 100644
--- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
+++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
@@ -477,7 +477,6 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
         verify(mockedNodeService, never()).removeChild(hold, recordFolder);
         verify(mockedNodeService, never()).removeAspect(recordFolder, ASPECT_FROZEN);
         verify(mockedNodeService, never()).removeAspect(record, ASPECT_FROZEN);
-        verify(mockedRecordsManagementAuditService, never()).auditEvent(eq(recordFolder), anyString());
     }
 
     @Test