Merge remote-tracking branch 'origin/release/V2.3' into merge-2.4/Merge231AfterReleaseIn24

# Conflicts: # rm-automation/src/main/java/org/alfresco/po/common/util/Utils.java # rm-automation/src/main/java/org/alfresco/po/rm/disposition/edit/steps/EditDispositionSchedulePage.java # rm-automation/src/main/java/org/alfresco/po/share/rules/RuleActions.java # rm-automation/src/test/java/org/alfresco/test/TestData.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/addRelationship/AddRelationship.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/audit/AuditAccess.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/disposition_schedule/FoldersDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/node_browser/NodeBrowser.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/CopyToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/FileToRuleAppliedOnUnfiledRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/LinkToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/rules/MoveToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/userDashboard/AdminDashboardMyDocumentsFilter.java # rm-automation/src/test/java/org/alfresco/test/coreTests/level2/versions/RecordVersions.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/BasicRulesIntegration.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateCategories.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateElectronicRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateFolders.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/CreateNonElectronicRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareInPlaceRecord.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/DeclareVersionAsRecord.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/FileUnfiledRecords.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RecordsDispositionScheduleWithGhosting.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/RejectRecord.java # rm-automation/src/test/java/org/alfresco/test/coreTests/smoke/SearchRecords.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/audit/AuditAccess.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/DispositionScheduleLinkedRecords.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/disposition_schedule/FoldersDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/node_browser/NodeBrowser.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/CopyToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/FileToRuleAppliedOnUnfiledRecords.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/LinkToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/MoveToRuleOnFolders.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/RulesAppliedOnWholeFilePlan.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/rules/SetPropertyValueCollSiteAndFilePlan.java # rm-automation/src/test/java/org/alfresco/test/integration/level2/userDashboard/AdminDashboardMyDocumentsFilter.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/CreateCategories.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/DeclareVersionAsRecord.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionSchedule.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/RecordsDispositionScheduleWithGhosting.java # rm-automation/src/test/java/org/alfresco/test/integration/smoke/RejectRecord.java # rm-automation/src/test/resources/coreTests.xml # rm-automation/src/test/resources/testng.xml
2025-07-31 17:39:05 +00:00 · 2016-11-14 17:17:45 +02:00
parent 9ab1024c7b ee41095e1b
commit 6323c97f26
4 changed files with 72 additions and 50 deletions
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/audit/RecordsManagementAuditQueryParameters.java
@@ -40,7 +40,7 @@ import org.alfresco.service.namespace.QName;
 */
 public final class RecordsManagementAuditQueryParameters
 {
-    private int maxEntries = -1;
+    private int maxEntries = Integer.MAX_VALUE;
    private String user;
    private NodeRef nodeRef;
    private Date dateFrom;
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/behaviour/RecordsManagementSearchBehaviour.java
@@ -518,8 +518,6 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel
     * @param dispositionAction disposition action
     */
    private void updateDispositionActionProperties(NodeRef record, NodeRef dispositionAction)
-    {
-        if (!methodCached("updateDispositionActionProperties", record))
    {
        Map<QName, Serializable> props = nodeService.getProperties(record);

@@ -561,7 +559,6 @@ public class RecordsManagementSearchBehaviour implements RecordsManagementModel
                        props.get(PROP_RS_DISPOSITION_PERIOD_EXPRESSION));
        }
    }
-    }

    /**
     * On update of event execution information behaviour\
--- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/MultipleSchedulesTest.java
+++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/disposition/MultipleSchedulesTest.java
@@ -66,6 +66,10 @@ public class MultipleSchedulesTest extends BaseRMTestCase
    protected static final String CATEGORY_B_NAME = TEST_PREFIX + "CategoryB";
    /** The name to use for the folder within the second category. */
    protected static final String FOLDER_B_NAME = TEST_PREFIX + "FolderB";
+    /** The name to use for the third category. */
+    protected static final String CATEGORY_C_NAME = TEST_PREFIX + "CategoryC";
+    /** The name to use for the folder within the third category. */
+    protected static final String FOLDER_C_NAME = TEST_PREFIX + "FolderC";
    /** The name to use for the record. */
    protected static final String RECORD_NAME = TEST_PREFIX + "Record";

@@ -80,6 +84,10 @@ public class MultipleSchedulesTest extends BaseRMTestCase
    private NodeRef categoryB;
    /** The folder node within the second category. */
    private NodeRef folderB;
+    /** The third category node. */
+    private NodeRef categoryC;
+    /** The folder node within the third category. */
+    private NodeRef folderC;
    /** The record node. */
    private NodeRef record;

@@ -114,6 +122,7 @@ public class MultipleSchedulesTest extends BaseRMTestCase
        // Create two categories.
        categoryA = filePlanService.createRecordCategory(filePlan, CATEGORY_A_NAME);
        categoryB = filePlanService.createRecordCategory(filePlan, CATEGORY_B_NAME);
+        categoryC = filePlanService.createRecordCategory(filePlan, CATEGORY_C_NAME);
        // Create a disposition schedule for category A (Cut off immediately, then Destroy immediately).
        DispositionSchedule dispSchedA = utils.createBasicDispositionSchedule(categoryA, "instructions", "authority", true, false);
        Map<QName, Serializable> cutOffParamsA = ImmutableMap.of(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME,
@@ -135,9 +144,21 @@ public class MultipleSchedulesTest extends BaseRMTestCase
                        PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_ONE_WEEK,
                        PROP_DISPOSITION_PERIOD_PROPERTY, PROP_CUT_OFF_DATE);
        dispositionService.addDispositionActionDefinition(dispSchedB, destroyParamsB);
+        // Create a disposition schedule for category C (Cut off immediately, then Destroy one year after cutoff).
+        DispositionSchedule dispSchedC = utils.createBasicDispositionSchedule(categoryC, "instructions", "authority", true, false);
+        Map<QName, Serializable> cutOffParamsC = ImmutableMap.of(PROP_DISPOSITION_ACTION_NAME, CutOffAction.NAME,
+                        PROP_DISPOSITION_DESCRIPTION, "description",
+                        PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_IMMEDIATELY);
+        dispositionService.addDispositionActionDefinition(dispSchedC, cutOffParamsC);
+        Map<QName, Serializable> destroyParamsC = ImmutableMap.of(PROP_DISPOSITION_ACTION_NAME, DestroyAction.NAME,
+                        PROP_DISPOSITION_DESCRIPTION, "description",
+                        PROP_DISPOSITION_PERIOD, CommonRMTestUtils.PERIOD_ONE_YEAR,
+                        PROP_DISPOSITION_PERIOD_PROPERTY, PROP_CUT_OFF_DATE);
+        dispositionService.addDispositionActionDefinition(dispSchedC, destroyParamsC);
        // Create a folder within each category.
        folderA = recordFolderService.createRecordFolder(categoryA, FOLDER_A_NAME);
        folderB = recordFolderService.createRecordFolder(categoryB, FOLDER_B_NAME);
+        folderC = recordFolderService.createRecordFolder(categoryC, FOLDER_C_NAME);
    }

    /**
@@ -155,6 +176,7 @@ public class MultipleSchedulesTest extends BaseRMTestCase
        test()
            .given(() -> {
                setUpFilePlan();
+                
                // Create a record filed under category A and linked to category B.
                record = fileFolderService.create(folderA, RECORD_NAME, ContentModel.TYPE_CONTENT).getNodeRef();
                recordService.link(record, folderB);
@@ -219,19 +241,22 @@ public class MultipleSchedulesTest extends BaseRMTestCase
        test()
            .given(() -> {
                setUpFilePlan();
-                // Create a record filed under category A and linked to category B.
+                // Create a record filed under category A and linked to category B and C.
                record = fileFolderService.create(folderA, RECORD_NAME, ContentModel.TYPE_CONTENT).getNodeRef();
                recordService.link(record, folderB);
-            })
-            .when(() -> {
+                recordService.link(record, folderC);
                // Cut off the record.
                dispositionService.cutoffDisposableItem(record);
+                // Ensure the update has been applied to the record.
+                internalDispositionService.updateNextDispositionAction(record);
+            })
+            .when(() -> {
                // Unlink the record from folder B.
                recordService.unlink(record, folderB);
            })
            .then()
-                .expect(true)
+                .expect(false)
                        .from(() -> dispositionService.isNextDispositionActionEligible(record))
-                    .because("Destroy action should be available, as the record should follow its origin disposition schedule.");
+                    .because("Destroy action shouldn't be available, as the record should follow disposition schedule from category C.");
    }
 }
--- 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
@@ -171,9 +171,9 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
        // "audit.start", "audit.view" and "Update RM Object";
        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(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().

@@ -185,14 +185,14 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
                nodeService.deleteNode(record);
                List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER);

-                assertEquals(entries.get(0).getEvent(), "audit.start");
-                assertEquals(entries.get(1).getEvent(), "audit.view");
-                assertEquals(entries.get(2).getEvent(), "Update RM Object");
+                assertEquals(entries.get(4).getEvent(), "audit.start");
                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:
-                assertEquals(entries.get(4).getEvent(), "Delete RM Object");
-                assertEquals(entries.get(4).getNodeRef(), record);
+                assertEquals(entries.get(0).getEvent(), "Delete RM Object");
+                assertEquals(entries.get(0).getNodeRef(), record);

                return null;
            }
@@ -212,7 +212,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase

        // show the audit has been updated
        List<RecordsManagementAuditEntry> entries = getAuditTrail(3, ADMIN_USER);
-        final RecordsManagementAuditEntry entry = entries.get(2);
+        final RecordsManagementAuditEntry entry = entries.get(0);
        assertNotNull(entry);

        // investigate the contents of the audit entry