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

MNT-9318: CLONE - It's impossible to update comment for the content after version revert

Browse Source 
Merged V4.1-BUG-FIX (4.1.7) to HEAD (4.2)
    55265: Merged DEV to V4.1-BUG-FIX (4.1.7)
       55184: MNT-6334: It's impossible to update comment for the content after version revert
        - Restore association if it was removed in older document version.
        - Extend unit test.
       55221: MNT-6334: It's impossible to update comment for the content after version revert
        - Make corrections to the code.
        - Extend unit test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2013-09-16 10:53:10 +00:00
parent ed839dcbe0
commit 47436a8477
7 changed files with 158 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ import org.alfresco.service.cmr.version.VersionServiceException;
import org.alfresco.service.cmr.version.VersionType;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.GUID;
import org.apache.commons.logging.Log;
@@ -593,7 +594,7 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
createComment(versionableNode, "my comment", "Do great work", false);
assertTrue(nodeService.hasAspect(versionableNode, ForumModel.ASPECT_DISCUSSABLE));
assertTrue("fm:discussion association must exist", nodeService.getChildAssocs(versionableNode).size() > 0);
assertTrue("fm:discussion association must exist", nodeService.getChildAssocs(versionableNode, ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL).size() > 0);
assertEquals(1, this.dbNodeService.getProperty(versionableNode, ForumModel.PROP_COMMENT_COUNT));
// Create a new version
@@ -607,8 +608,48 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
//Revert to a version that has comments.
this.versionService.revert(versionableNode, version3);
assertTrue(nodeService.hasAspect(versionableNode, ForumModel.ASPECT_DISCUSSABLE));
assertTrue("fm:discussion association must exist", nodeService.getChildAssocs(versionableNode).size() > 0);
assertTrue("fm:discussion association must exist", nodeService.getChildAssocs(versionableNode, ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL).size() > 0);
assertEquals("I am version 3", this.dbNodeService.getProperty(versionableNode, PROP_1));
//Test reverting from version without comments to version that has comments
//Revert to a version that has no comments.
this.versionService.revert(versionableNode, version1);
assertEquals("I am before version", this.dbNodeService.getProperty(versionableNode, PROP_1));
assertFalse(nodeService.hasAspect(versionableNode, ForumModel.ASPECT_DISCUSSABLE));
//Revert to a version that has comments.
this.versionService.revert(versionableNode, version3);
assertTrue(nodeService.hasAspect(versionableNode, ForumModel.ASPECT_DISCUSSABLE));
assertTrue("fm:discussion association must exist", nodeService.getChildAssocs(versionableNode, ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL).size() > 0);
assertEquals("I am version 3", this.dbNodeService.getProperty(versionableNode, PROP_1));
//Test reverting from version with comments to another version with comments, but with another 'forum' node
NodeRef clearNode = createNewVersionableNode();
//Create version without comments
Version clearVersion1 = createVersion(clearNode);
//Create version with comments
createComment(clearNode, "my comment", "Do great work", false);
assertTrue(nodeService.hasAspect(clearNode, ForumModel.ASPECT_DISCUSSABLE));
Version clearVersion2 = createVersion(clearNode);
//Revert to version without comments
this.versionService.revert(clearNode, clearVersion1);
assertFalse(nodeService.hasAspect(clearNode, ForumModel.ASPECT_DISCUSSABLE));
//Create new version with comments
createComment(clearNode, "my comment", "Do great work", false);
Version clearVersion3 = createVersion(clearNode);
//Revert from version with comments, to version with another comments
this.versionService.revert(clearNode, clearVersion2);
assertTrue(nodeService.hasAspect(versionableNode, ForumModel.ASPECT_DISCUSSABLE));
assertTrue("fm:discussion association must exist", nodeService.getChildAssocs(clearNode, ForumModel.ASSOC_DISCUSSION, RegexQNamePattern.MATCH_ALL).size() > 0);
}
@@ -788,6 +829,7 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
// Create a versionable node
NodeRef versionableNode = createNewVersionableNode();
createComment(versionableNode, "my comment", "Do great work", false);
// It isn't currently versionable
assertEquals(null, versionService.getVersionHistory(versionableNode));