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 MNT-17845-5.2.N (5.2.2) to 5.2.N (5.2.2)

Browse Source 
137772 anechifor: REPO-2516 - MNT-17845 : Smart Folders - subtitute isReference with fromNodeRef


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2017-06-23 11:37:10 +00:00
parent 689c4cac70
commit f84a7bf2f3
9 changed files with 163 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/test-java/org/alfresco/repo/virtual/bundle/VirtualNodeServiceExtensionTest.java
View File

@@ -150,9 +150,10 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
"Node2_1");
ChildAssociationRef childAssocRef = createContent(assocNode2_1,
"Content");
NodeRef node = childAssocRef.getChildRef();
assertTrue(Reference.isReference(node));
assertTrue(Reference.fromNodeRef(node).getProtocol().equals(Protocols.NODE.protocol));
NodeRef node = childAssocRef.getChildRef();
Reference reference = Reference.fromNodeRef(node);
assertNotNull(reference);
assertTrue(reference.getProtocol().equals(Protocols.NODE.protocol));
QName nodeTypeQName = ContentModel.TYPE_THUMBNAIL;
QName assocQName = QName.createQName("cm", "contentThumbnail", environment.getNamespacePrefixResolver());
@@ -369,9 +370,10 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
* @param childAssocsRef
*/
private void assertNewVirtualChildAssocRef(NodeRef nodeRef, ChildAssociationRef childAssocsRef)
{
assertTrue(Reference.isReference(nodeRef));
assertNewVirtualChildAssocRef(Reference.fromNodeRef(nodeRef),
{
Reference reference = Reference.fromNodeRef(nodeRef);
assertNotNull(reference);
assertNewVirtualChildAssocRef(reference,
childAssocsRef);
}
@@ -387,14 +389,13 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
assertNotNull(childAssocsRef);
NodeRef childNodeRef = childAssocsRef.getChildRef();
NodeRef parentNodeRef = childAssocsRef.getParentRef();
Reference parentNodeRefV = Reference.fromNodeRef(parentNodeRef);
assertNotNull(parentNodeRefV);
assertEquals(reference,parentNodeRefV);
assertTrue(Reference.isReference(parentNodeRef));
assertEquals(reference,
Reference.fromNodeRef(parentNodeRef));
assertTrue(Reference.isReference(childNodeRef));
Reference.fromNodeRef(childNodeRef);
Reference childReference = Reference.fromNodeRef(childNodeRef);
Reference childReference = Reference.fromNodeRef(childNodeRef);
assertNotNull(childReference);
Reference parent = childReference.execute(new GetParentReferenceMethod());
assertEquals(reference,
parent);
@@ -527,9 +528,10 @@ public class VirtualNodeServiceExtensionTest extends VirtualizationIntegrationTe
private ChildAssociationRef findActualAssocPeer(ChildAssociationRef virtualAssoc, NodeRef actualParentNodeRef)
{
List<ChildAssociationRef> actualAssocs = nodeService.getChildAssocs(actualParentNodeRef);
NodeRef virtualChildNodeRef = virtualAssoc.getChildRef();
assertTrue(Reference.isReference(virtualChildNodeRef));
NodeRef materialNodeRef = smartStore.materialize(Reference.fromNodeRef(virtualChildNodeRef));
NodeRef virtualChildNodeRef = virtualAssoc.getChildRef();
Reference vChildNodeRef = Reference.fromNodeRef(virtualChildNodeRef);
assertNotNull(vChildNodeRef);
NodeRef materialNodeRef = smartStore.materialize(vChildNodeRef);
for (ChildAssociationRef actualAssocRef : actualAssocs)
{