diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java index 03e2f64c87..1ebf45354d 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java @@ -54,21 +54,21 @@ public class RMv33HoldAuditEntryValuesPatch extends AbstractModulePatch /** * @see org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch#applyInternal() * - * Updates the property string value entities for addToHold and removeFromHold audit event types + * Updates the property string value entities for addToHold, removeFromHold and deleteHold audit event types */ @Override public void applyInternal() { updatePropertyStringValueEntity("addToHold", "Add To Hold"); updatePropertyStringValueEntity("removeFromHold", "Remove From Hold"); - + updatePropertyStringValueEntity("deleteHold", "Delete Hold"); } private void updatePropertyStringValueEntity(String fromStringValue, String toStringValue) { - PropertyStringValueEntity addToAuditPropertyStringValueEntity = recordsManagementQueryDAO.getPropertyStringValueEntity(fromStringValue); - addToAuditPropertyStringValueEntity.setValue(toStringValue); - recordsManagementQueryDAO.updatePropertyStringValueEntity(addToAuditPropertyStringValueEntity); + PropertyStringValueEntity propertyStringValueEntity = recordsManagementQueryDAO.getPropertyStringValueEntity(fromStringValue); + propertyStringValueEntity.setValue(toStringValue); + recordsManagementQueryDAO.updatePropertyStringValueEntity(propertyStringValueEntity); } } diff --git a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java index c742f78726..264e1e0831 100644 --- a/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java +++ b/rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java @@ -62,7 +62,7 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest } /** - * addtohold and removeFromHold audit entries values are updated after the patch is executed + * addtohold, removeFromHold and deleteHold audit entries values are updated after the patch is executed */ @Test public void holdAuditEntriesAreUpdatedAfterUpgrade() @@ -77,12 +77,19 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest when(mockedRecordsManagementQueryDAO.getPropertyStringValueEntity("removeFromHold")).thenReturn(removeFromHoldPropertyStringValueEntity); when(mockedRecordsManagementQueryDAO.updatePropertyStringValueEntity(removeFromHoldPropertyStringValueEntity)).thenReturn(1); + PropertyStringValueEntity deleteHoldPropertyStringValueEntity = new PropertyStringValueEntity(); + deleteHoldPropertyStringValueEntity.setValue("deleteHold"); + when(mockedRecordsManagementQueryDAO.getPropertyStringValueEntity("deleteHold")).thenReturn(deleteHoldPropertyStringValueEntity); + when(mockedRecordsManagementQueryDAO.updatePropertyStringValueEntity(deleteHoldPropertyStringValueEntity)).thenReturn(1); + patch.applyInternal(); verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("addToHold"); verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(addToHoldPropertyStringValueEntity); verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("removeFromHold"); verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(removeFromHoldPropertyStringValueEntity); + verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("deleteHold"); + verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(deleteHoldPropertyStringValueEntity); assertEquals("Add To Hold", addToHoldPropertyStringValueEntity.getStringValue()); assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringEndLower()); @@ -91,6 +98,10 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest assertEquals("Remove From Hold", removeFromHoldPropertyStringValueEntity.getStringValue()); assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringEndLower()); assertEquals(Long.valueOf(2_967_613_012L), removeFromHoldPropertyStringValueEntity.getStringCrc()); + + assertEquals("Delete Hold", deleteHoldPropertyStringValueEntity.getStringValue()); + assertEquals("delete hold", deleteHoldPropertyStringValueEntity.getStringEndLower()); + assertEquals(Long.valueOf(132_640_810L), deleteHoldPropertyStringValueEntity.getStringCrc()); } }