Merged MNT-17845-5.2.N (5.2.2) to 5.2.N (5.2.2)

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

View File

@@ -107,10 +107,10 @@ public class VirtualVersionServiceExtensionTest extends VirtualizationIntegratio
ChildAssociationRef contentWithVersionsAssocRef = createContent(node2_1,
"ContentWithVersions");
NodeRef contentWithVersionsNodeRef = contentWithVersionsAssocRef.getChildRef();
assertTrue(Reference.isReference(contentWithVersionsNodeRef));
NodeRef actualContentWithVersionsNodeRef = Reference
.fromNodeRef(contentWithVersionsNodeRef)
.execute(new GetActualNodeRefMethod(environment));
Reference reference = Reference.fromNodeRef(contentWithVersionsNodeRef);
assertNotNull(reference);
NodeRef actualContentWithVersionsNodeRef =
reference.execute(new GetActualNodeRefMethod(environment));
VersionHistory versionHistory = versionService.getVersionHistory(contentWithVersionsNodeRef);
assertNull(versionHistory);
@@ -121,7 +121,7 @@ public class VirtualVersionServiceExtensionTest extends VirtualizationIntegratio
null);
NodeRef newVersionNodeRef = newVersion.getVersionedNodeRef();
assertTrue(Reference.isReference(newVersionNodeRef));
assertNotNull(Reference.fromNodeRef(newVersionNodeRef));
versionHistory = versionService.getVersionHistory(newVersionNodeRef);
assertNotNull(versionHistory);
@@ -140,7 +140,7 @@ public class VirtualVersionServiceExtensionTest extends VirtualizationIntegratio
Version actualVersion = actualVersionHistory.getHeadVersion();
NodeRef newActualVersionNodeRef = actualVersion.getVersionedNodeRef();
assertTrue(!Reference.isReference(newActualVersionNodeRef));
assertNull(Reference.fromNodeRef(newActualVersionNodeRef));
assertEquals(newActualVersionNodeRef,
actualContentWithVersionsNodeRef);