mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged DEV to HEAD
- ALF-8806 RINF 41: Lucene Removal: Fix CopyService - ALF-9028: RINF 41: Fix Aspect cm:copiedFrom - ALF-9029 RINF 49: Lucene Removal: CheckOutCheckInService API - ALF-9032: RINF 49: fixes to cm:workingcopy aspect 28996: Dev branch for De-Lucene work pending patches 29004: Evaluator runs in read-only txn 29006: Additional PermissionCheckedCollection.create method - Use an existing collection's permission check data (cut-off, etc) to wrap a new collection 29007: CopyService and CheckOutCheckInService refactors to remove Lucene CopyService: Removed cm:source property from cm:copiedfrom aspect and replaced with a cm:original association. Added CQ-based APIs to query for copies Added APIs to support bi-directional walking of copy association Fixed sundry uses of cm:copiedfrom esp. all uses related to cm:workingcopy CheckOutCheckInService: Check-out now creates a source aspect cm:checkedOut with 1:1 relationship to cm:workingcopy via cm:workingcopylink Removed explicit use of cm:workingcopy aspect and replaced it with calls to COCI API 29083: Audit tests fail when indexing is turned off. Also removed a getReader() call during rule evaluation, leading to a 'sub-action' read being recorded. 29113: NodeDAO.getNodesWithAspects supports paging 29135: Removed unused patch queries 29139: Basic patch (still terminates with error) to upgrade cm:copiedfrom and cm:workingcopy 29157: Tested patch for cm:copiedfrom and cm:workingcopy aspects git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29159 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -902,6 +902,8 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
*/
|
||||
public void testCopyAction()
|
||||
{
|
||||
String localName = getName() + System.currentTimeMillis();
|
||||
|
||||
Map<String, Serializable> params = new HashMap<String, Serializable>(1);
|
||||
params.put(MoveActionExecuter.PARAM_DESTINATION_FOLDER, this.rootNodeRef);
|
||||
|
||||
@@ -917,7 +919,7 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
NodeRef newNodeRef = this.nodeService.createNode(
|
||||
this.nodeRef,
|
||||
ContentModel.ASSOC_CHILDREN,
|
||||
QName.createQName(TEST_NAMESPACE, "origional"),
|
||||
QName.createQName(TEST_NAMESPACE, localName),
|
||||
ContentModel.TYPE_CONTENT,
|
||||
getContentProperties()).getChildRef();
|
||||
addContentToNode(newNodeRef);
|
||||
@@ -928,7 +930,7 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
List<ChildAssociationRef> origRefs = this.nodeService.getChildAssocs(
|
||||
this.nodeRef,
|
||||
RegexQNamePattern.MATCH_ALL,
|
||||
QName.createQName(TEST_NAMESPACE, "origional"));
|
||||
QName.createQName(TEST_NAMESPACE, localName));
|
||||
assertNotNull(origRefs);
|
||||
assertEquals(1, origRefs.size());
|
||||
NodeRef origNodeRef = origRefs.get(0).getChildRef();
|
||||
@@ -937,7 +939,7 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
// Check that the created node has been copied
|
||||
List<ChildAssociationRef> copyChildAssocRefs = this.nodeService.getChildAssocs(
|
||||
this.rootNodeRef,
|
||||
RegexQNamePattern.MATCH_ALL, QName.createQName(TEST_NAMESPACE, "origional"));
|
||||
RegexQNamePattern.MATCH_ALL, QName.createQName(TEST_NAMESPACE, localName));
|
||||
assertNotNull(copyChildAssocRefs);
|
||||
|
||||
// **********************************
|
||||
@@ -947,7 +949,7 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
|
||||
NodeRef copyNodeRef = copyChildAssocRefs.get(0).getChildRef();
|
||||
assertTrue(this.nodeService.hasAspect(copyNodeRef, ContentModel.ASPECT_COPIEDFROM));
|
||||
NodeRef source = (NodeRef)this.nodeService.getProperty(copyNodeRef, ContentModel.PROP_COPY_REFERENCE);
|
||||
NodeRef source = copyService.getOriginal(copyNodeRef);
|
||||
assertEquals(newNodeRef, source);
|
||||
|
||||
// TODO test deep copy !!
|
||||
@@ -1028,7 +1030,7 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
assertEquals(1, copyChildAssocRefs.size());
|
||||
NodeRef copyNodeRef = copyChildAssocRefs.get(0).getChildRef();
|
||||
assertTrue(this.nodeService.hasAspect(copyNodeRef, ContentModel.ASPECT_COPIEDFROM));
|
||||
NodeRef source = (NodeRef)this.nodeService.getProperty(copyNodeRef, ContentModel.PROP_COPY_REFERENCE);
|
||||
NodeRef source = copyService.getOriginal(copyNodeRef);
|
||||
assertEquals(newNodeRef, source);
|
||||
|
||||
// Check the transformed content
|
||||
@@ -1107,7 +1109,7 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
assertEquals(1, copyChildAssocRefs.size());
|
||||
NodeRef copyNodeRef = copyChildAssocRefs.get(0).getChildRef();
|
||||
assertTrue(this.nodeService.hasAspect(copyNodeRef, ContentModel.ASPECT_COPIEDFROM));
|
||||
NodeRef source = (NodeRef)this.nodeService.getProperty(copyNodeRef, ContentModel.PROP_COPY_REFERENCE);
|
||||
NodeRef source = copyService.getOriginal(copyNodeRef);
|
||||
assertEquals(newNodeRef, source);
|
||||
}
|
||||
|
||||
@@ -1215,7 +1217,7 @@ public class RuleServiceCoverageTest extends TestCase
|
||||
else if (this.nodeService.hasAspect(childNodeRef, ContentModel.ASPECT_WORKING_COPY) == true)
|
||||
{
|
||||
// assert that it is the working copy that relates to the origional node
|
||||
NodeRef copiedFromNodeRef = (NodeRef)this.nodeService.getProperty(childNodeRef, ContentModel.PROP_COPY_REFERENCE);
|
||||
NodeRef copiedFromNodeRef = copyService.getOriginal(childNodeRef);
|
||||
assertEquals(newNodeRef, copiedFromNodeRef);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user