From 16d4f726e05ac48d93e78eb479fc164d478e51bf Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Mon, 3 Apr 2017 12:05:24 +0100 Subject: [PATCH] RM-2396: Fixed failing integration tests --- .../version/RecordableVersionServiceImpl.java | 1 + .../test/integration/version/RecordableVersionsBaseTest.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java index f7e191e0b2..0f594b5a91 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/version/RecordableVersionServiceImpl.java @@ -764,6 +764,7 @@ public class RecordableVersionServiceImpl extends Version2ServiceImpl versionRecordProps.put(PROP_VERSIONED_NODEREF, nodeRef); versionRecordProps.put(RecordableVersionModel.PROP_VERSION_LABEL, currentVersion.getVersionLabel()); versionRecordProps.put(RecordableVersionModel.PROP_VERSION_DESCRIPTION, currentVersion.getDescription()); + versionRecordProps.put(ContentModel.PROP_VERSION_TYPE, currentVersion.getVersionType()); nodeService.addAspect(record, ASPECT_VERSION_RECORD, versionRecordProps); // wire record up to previous record diff --git a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java index 2140a6e96e..e53a7691bf 100644 --- a/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java +++ b/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/RecordableVersionsBaseTest.java @@ -245,7 +245,9 @@ public abstract class RecordableVersionsBaseTest extends BaseRMTestCase implemen !PROP_RECORDABLE_VERSION_POLICY.equals(beforePropertyName) && !ContentModel.PROP_AUTO_VERSION_PROPS.equals(beforePropertyName) && !ContentModel.PROP_AUTO_VERSION.equals(beforePropertyName) && - !ContentModel.PROP_INITIAL_VERSION.equals(beforePropertyName)) + !ContentModel.PROP_INITIAL_VERSION.equals(beforePropertyName) && + !ContentModel.PROP_VERSION_TYPE.equals(beforePropertyName) && + !ContentModel.PROP_VERSION_LABEL.equals(beforePropertyName)) { fail("Property missing from frozen state .. " + beforePropertyName); }