mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.1 to HEAD
13033: Back end support for ETHREEOH-1179 13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests 13046: Merged V3.0 to V3.1 13043: Merged V2.2 to V3.0 13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete) 13049: Build/test fix (WCM AssetTest) 13057: Merged V2.1-A to V3.1 8770: Added Flex SDK module 8771: Added Flex SDK binary (swc) DH: I'm not sure about the svn:eol-style property appearing here. SVN Clients? 13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin. 13060: [no comments] 13061: [no comments] 13063: [no comments] 13064: [no comments] 13066: [no comments] 13067: Add NodeService.getChildrenByName 13072: Added new NodeService.getChildrenByName() method to public-services-security-context. ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r13043 Merged /alfresco/BRANCHES/V2.2:r13016 Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -27,6 +27,7 @@ package org.alfresco.repo.node;
|
||||
import java.io.InputStream;
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
@@ -2269,6 +2270,15 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
ContentModel.TYPE_CONTENT,
|
||||
props);
|
||||
NodeRef defRef = pathDefRef.getChildRef();
|
||||
// create node KLM
|
||||
props.put(ContentModel.PROP_NAME, "KLM");
|
||||
ChildAssociationRef pathKlmRef = nodeService.createNode(
|
||||
abcRef,
|
||||
ASSOC_TYPE_QNAME_TEST_CONTAINS,
|
||||
QName.createQName("KLM"),
|
||||
ContentModel.TYPE_CONTENT,
|
||||
props);
|
||||
NodeRef klmRef = pathDefRef.getChildRef();
|
||||
|
||||
// now browse down using the node service
|
||||
NodeRef checkAbcRef = nodeService.getChildByName(parentRef, ASSOC_TYPE_QNAME_TEST_CONTAINS, "abc");
|
||||
@@ -2280,6 +2290,13 @@ public abstract class BaseNodeServiceTest extends BaseSpringTest
|
||||
// check that we get null where not present
|
||||
NodeRef checkHijRef = nodeService.getChildByName(checkAbcRef, ASSOC_TYPE_QNAME_TEST_CONTAINS, "hij");
|
||||
assertNull("Third level, named node 'HIJ' should not have been found", checkHijRef);
|
||||
|
||||
// Now search for multiple names
|
||||
List<String> namesList = Arrays.asList("ABC", "DEF", "HIJ", "KLM");
|
||||
List<ChildAssociationRef> childAssocRefs = nodeService.getChildrenByName(checkAbcRef, ASSOC_TYPE_QNAME_TEST_CONTAINS, namesList);
|
||||
assertEquals("Expected exactly 2 results", 2, childAssocRefs.size());
|
||||
assertTrue("Expected result not included", childAssocRefs.contains(pathDefRef));
|
||||
assertTrue("Expected result not included", childAssocRefs.contains(pathKlmRef));
|
||||
}
|
||||
|
||||
public void testLocalizedAspect() throws Exception
|
||||
|
Reference in New Issue
Block a user