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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78501: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      76817: MNT-11756: Merged DEV to V4.2-BUG-FIX (4.2.4)
         76808: MNT-11756: Associated nodes deleted when reverting to older version.
            - Keep secondary association during revert if versioned and current node have child association with the same node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:20:51 +00:00
parent e35970c3f1
commit f4e6466c93
4 changed files with 92 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -714,6 +714,48 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
}
/**
* Test that secondary association is present after revert, see MNT-11756
*/
public void testAssociationIsPresentAfterRevert()
{
// Create Order
NodeRef orderNodeRef = this.dbNodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN,
QName.createQName("{test}MyVersionableOrder"), TEST_ATS_PARENT_TYPE_QNAME, this.nodeProperties).getChildRef();
this.dbNodeService.addAspect(orderNodeRef, ContentModel.ASPECT_VERSIONABLE, new HashMap<QName, Serializable>());
assertNotNull(orderNodeRef);
this.dbNodeService.setProperty(orderNodeRef, PROP_ATS_PARENT_ID, 1);
// Create Order-Product association
NodeRef productNodeRef = this.dbNodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN,
QName.createQName("{test}MyProduct1"), TEST_ATS_CHILD_TYPE_QNAME, this.nodeProperties).getChildRef();
this.dbNodeService.setProperty(orderNodeRef, PROP_ATS_CHILD_ID, 1);
ChildAssociationRef childAssoc = this.dbNodeService.addChild(orderNodeRef, productNodeRef, TEST_ATS_RELATED_CHILDREN_QNAME, TEST_ATS_RELATED_CHILDREN_QNAME);
assertFalse("Order-product child association should not be primary", childAssoc.isPrimary());
// Create version
Version version1 = createVersion(orderNodeRef);
this.dbNodeService.setProperty(orderNodeRef, PROP_ATS_PARENT_ID, 2);
assertEquals("New property should be set", 2, this.dbNodeService.getProperty(orderNodeRef, PROP_ATS_PARENT_ID));
List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(orderNodeRef, TEST_ATS_RELATED_CHILDREN_QNAME, RegexQNamePattern.MATCH_ALL);
assertTrue("Order-Product association must exist", childAssocs.size() > 0);
assertTrue("Order should have Order-Product association", childAssocs.contains(childAssoc));
VersionHistory vh = this.versionService.getVersionHistory(orderNodeRef);
assertNotNull(vh);
assertEquals(1, vh.getAllVersions().size());
// Revert
this.versionService.revert(orderNodeRef, version1);
assertEquals("Old property should restore after revert", 1, this.dbNodeService.getProperty(orderNodeRef, PROP_ATS_PARENT_ID));
childAssocs = nodeService.getChildAssocs(orderNodeRef, TEST_ATS_RELATED_CHILDREN_QNAME, RegexQNamePattern.MATCH_ALL);
assertTrue("Order-Product association must exist after revert", childAssocs.size() > 0);
assertTrue("Order-Product association should remain the same", childAssocs.contains(childAssoc));
}
/**
* This method was taken from the CommmentServiceImpl on the cloud branch
*