From b103488864392e064384862253e1824151b1772a Mon Sep 17 00:00:00 2001 From: Claudia Agache Date: Wed, 6 May 2020 12:34:57 +0300 Subject: [PATCH] Check if a node has been automatically cut off by the job before executing the Cut off action on it. Try to fix: [ERROR] SearchByDeclassificationReviewTest.setupSearchByDeclassificationReviewTest:120->lambda$setupSearchByDeclassificationReviewTest$1:121 POST request to http://35.180.136.204:8080/alfresco/service/api/rma/actions/ExecutionQueue was not successful. expected:<200> but was:<500> --- .../model/fileplancomponents/FilePlanComponentAspects.java | 7 +++++-- .../recordcategories/AutomaticDispositionTest.java | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java index 06c7493f17..78fa8ebe49 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java @@ -41,10 +41,10 @@ public class FilePlanComponentAspects // aspect present on completed records public static final String ASPECTS_COMPLETED_RECORD = "rma:declaredRecord"; - + // aspect present on record folders/categories with vital records public static final String ASPECTS_VITAL_RECORD_DEFINITION= "rma:vitalRecordDefinition"; - + // aspect present on vital records public static final String ASPECTS_VITAL_RECORD = "rma:vitalRecord"; @@ -53,4 +53,7 @@ public class FilePlanComponentAspects // recordSearch aspect public static final String RECORD_SEARCH_ASPECT = "rma:recordSearch"; + + // retention schedule cut off aspect + public static final String CUT_OFF_ASPECT = "rma:cutOff"; } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java index 56e904c0d5..075eeedc3a 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java @@ -26,6 +26,7 @@ */ package org.alfresco.rest.rm.community.recordcategories; +import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.CUT_OFF_ASPECT; import static org.alfresco.utility.data.RandomData.getRandomName; import static org.alfresco.utility.report.log.Step.STEP; import static org.testng.Assert.assertTrue; @@ -45,8 +46,6 @@ import org.testng.annotations.Test; public class AutomaticDispositionTest extends BaseRMRestTest { - private static final String CUT_OFF_ASPECT = "rma:cutOff"; - @Autowired private DispositionScheduleService dispositionScheduleService;