RM-2396: Fixed failing integration tests

This commit is contained in:
Tuna Aksoy
2017-04-03 12:05:24 +01:00
parent 9b23b2cbde
commit 16d4f726e0
2 changed files with 4 additions and 1 deletions

View File

@@ -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

View File

@@ -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);
}