MNT-13097 content reverted as well to head version if you delete last version of node

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2016-12-14 16:41:07 +00:00
parent 7984eb120a
commit f4e2424af7
2 changed files with 100 additions and 51 deletions

View File

@@ -1,28 +1,28 @@
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
/*
* #%L
* Alfresco Repository
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.repo.version;
import java.io.Serializable;
@@ -1232,6 +1232,51 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
assertEquals(version2.getVersionLabel(), versionLabel3);
}
/**
* Test test_MNT13097
* MNT-13097. Revert content if the last version is chosen.
*/
public void test_MNT13097()
{
// Use 1.0, 2.0 etc for the main part
versionProperties.put(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR);
// Create a versionable node with content
NodeRef versionableNode = createNewVersionableNode();
ContentWriter contentWriter = this.contentService.getWriter(versionableNode, ContentModel.PROP_CONTENT, true);
assertNotNull(contentWriter);
contentWriter.putContent(UPDATED_CONTENT_1);
// Create first version
Version version1 = createVersion(versionableNode);
// Update Content
contentWriter = this.contentService.getWriter(versionableNode, ContentModel.PROP_CONTENT, true);
contentWriter.putContent(UPDATED_CONTENT_2);
// Create second version
Version version2 = createVersion(versionableNode);
// Check that the version label is right
Version currentVersion = this.versionService.getCurrentVersion(versionableNode);
assertEquals(version2.getVersionLabel(), currentVersion.getVersionLabel());
// Check that the content is right
ContentReader contentReader1 = this.contentService.getReader(versionableNode, ContentModel.PROP_CONTENT);
assertEquals(UPDATED_CONTENT_2, contentReader1.getContentString());
// Delete version 2.0
this.versionService.deleteVersion(versionableNode, version2);
// Check that the version label is resetted
currentVersion = this.versionService.getCurrentVersion(versionableNode);
assertEquals(version1.getVersionLabel(), currentVersion.getVersionLabel());
// Check that the content has been reverted
contentReader1 = this.contentService.getReader(versionableNode, ContentModel.PROP_CONTENT);
assertEquals(UPDATED_CONTENT_1, contentReader1.getContentString());
}
/**
* Test deleteVersion