inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1.N (5.1.1) to HEAD (5.1)

Browse Source 
120108 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
         120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
            120019 amukha: MNT-14688: version revert on first version failure if type has aspect
               - Restoring a version now restores the node's type.
               - Added JUnit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 21:34:50 +00:00
parent e39037672c
commit 096c5871d8
4 changed files with 107 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
source/test-java/org/alfresco/repo/version/VersionServiceImplTest.java
View File

@@ -1004,7 +1004,60 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
fail("Transaction failed: " + e);
}
}
/**
* Test reverting from Share with changing type
* see MNT-14688
* <li>
* <ul>1) Create a node and a version (simulates upload a doc to Share)</ul>
* <ul>2) Change the node's type to a custom with mandatory aspect</ul>
* <ul>3) Create a new version via upload</ul>
* <ul>4) Try to revert to original document and see if the type is reverted, too</ul>
* </li>
*/
@SuppressWarnings("unused")
public void testScriptNodeRevertWithChangeType()
{
CheckOutCheckInService checkOutCheckInService =
(CheckOutCheckInService) applicationContext.getBean("checkOutCheckInService");
// Create a versionable node
NodeRef versionableNode = createNewVersionableNode();
Version version1 = createVersion(versionableNode);
//Set new type
nodeService.setType(versionableNode, TEST_TYPE_WITH_MANDATORY_ASPECT_QNAME);
// Create a new version
NodeRef checkedOut = checkOutCheckInService.checkout(versionableNode);
ContentWriter contentWriter = this.contentService.getWriter(checkedOut, ContentModel.PROP_CONTENT, true);
assertNotNull(contentWriter);
contentWriter.putContent(UPDATED_CONTENT_1);
nodeService.setProperty(checkedOut, PROP_1, VALUE_1);
checkOutCheckInService.checkin(checkedOut, null, contentWriter.getContentUrl(), false);
Version version2 = createVersion(versionableNode);
// Create a ScriptNode as used in Share
ServiceRegistry services = applicationContext.getBean(ServiceRegistry.class);
ScriptNode scriptNode = new ScriptNode(versionableNode, services);
assertEquals("0.2", nodeService.getProperty(scriptNode.getNodeRef(), ContentModel.PROP_VERSION_LABEL));
assertEquals(TEST_TYPE_WITH_MANDATORY_ASPECT_QNAME, nodeService.getType(scriptNode.getNodeRef()));
// Revert to version1
ScriptNode newNode = scriptNode.revert("History", false, version1.getVersionLabel());
assertEquals("0.3", nodeService.getProperty(newNode.getNodeRef(), ContentModel.PROP_VERSION_LABEL));
assertEquals(TEST_TYPE_QNAME, nodeService.getType(newNode.getNodeRef()));
// All done
setComplete();
try
{
endTransaction();
}
catch(Throwable e)
{
fail("Transaction failed: " + e);
}
}
/**
* Test restore
*/