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

RM-7101: [Upgrade] Delete hold audit events are not properly migrated

Browse Source
This commit is contained in:
Christopher Shields
2020-01-13 00:00:34 +00:00
parent f5d9c257b0
commit b6c7a504c1
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatch.java
View File

@@ -54,21 +54,21 @@ public class RMv33HoldAuditEntryValuesPatch extends AbstractModulePatch
/** /**
* @see org.alfresco.module.org_alfresco_module_rm.patch.AbstractModulePatch#applyInternal() * @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 @Override
public void applyInternal() public void applyInternal()
{ {
updatePropertyStringValueEntity("addToHold", "Add To Hold"); updatePropertyStringValueEntity("addToHold", "Add To Hold");
updatePropertyStringValueEntity("removeFromHold", "Remove From Hold"); updatePropertyStringValueEntity("removeFromHold", "Remove From Hold");
updatePropertyStringValueEntity("deleteHold", "Delete Hold");
} }
private void updatePropertyStringValueEntity(String fromStringValue, String toStringValue) private void updatePropertyStringValueEntity(String fromStringValue, String toStringValue)
{ {
PropertyStringValueEntity addToAuditPropertyStringValueEntity = recordsManagementQueryDAO.getPropertyStringValueEntity(fromStringValue); PropertyStringValueEntity propertyStringValueEntity = recordsManagementQueryDAO.getPropertyStringValueEntity(fromStringValue);
addToAuditPropertyStringValueEntity.setValue(toStringValue); propertyStringValueEntity.setValue(toStringValue);
recordsManagementQueryDAO.updatePropertyStringValueEntity(addToAuditPropertyStringValueEntity); recordsManagementQueryDAO.updatePropertyStringValueEntity(propertyStringValueEntity);
} }
} }

13
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/patch/v33/RMv33HoldAuditEntryValuesPatchUnitTest.java
View File

@@ -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 @Test
public void holdAuditEntriesAreUpdatedAfterUpgrade() public void holdAuditEntriesAreUpdatedAfterUpgrade()
@@ -77,12 +77,19 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
when(mockedRecordsManagementQueryDAO.getPropertyStringValueEntity("removeFromHold")).thenReturn(removeFromHoldPropertyStringValueEntity); when(mockedRecordsManagementQueryDAO.getPropertyStringValueEntity("removeFromHold")).thenReturn(removeFromHoldPropertyStringValueEntity);
when(mockedRecordsManagementQueryDAO.updatePropertyStringValueEntity(removeFromHoldPropertyStringValueEntity)).thenReturn(1); 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(); patch.applyInternal();
verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("addToHold"); verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("addToHold");
verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(addToHoldPropertyStringValueEntity); verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(addToHoldPropertyStringValueEntity);
verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("removeFromHold"); verify(mockedRecordsManagementQueryDAO, times(1)).getPropertyStringValueEntity("removeFromHold");
verify(mockedRecordsManagementQueryDAO, times(1)).updatePropertyStringValueEntity(removeFromHoldPropertyStringValueEntity); 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.getStringValue());
assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringEndLower()); assertEquals("add to hold", addToHoldPropertyStringValueEntity.getStringEndLower());
@@ -91,6 +98,10 @@ public class RMv33HoldAuditEntryValuesPatchUnitTest
assertEquals("Remove From Hold", removeFromHoldPropertyStringValueEntity.getStringValue()); assertEquals("Remove From Hold", removeFromHoldPropertyStringValueEntity.getStringValue());
assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringEndLower()); assertEquals("remove from hold", removeFromHoldPropertyStringValueEntity.getStringEndLower());
assertEquals(Long.valueOf(2_967_613_012L), removeFromHoldPropertyStringValueEntity.getStringCrc()); 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());
} }
} }