inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127588 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127088 jvonka: FileFolderService / GetChildrenCannedQuery - optional support for filtering by isPrimary child assoc (true/false) 
      - eg. as required by new V1 REST API
      - RA-1053


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127680 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:16:11 +00:00
parent 29656b443d
commit 4621b16359
6 changed files with 171 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/test-java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java
View File

@@ -306,7 +306,7 @@ public class GetChildrenCannedQueryTest extends TestCase
PagingResults<NodeRef> results = list(parentNodeRef, -1, -1, 0);
assertTrue(results.getPage().size() > 3);
}
public void testMaxItems() throws Exception
{
NodeRef parentNodeRef = getOrCreateParentTestFolder("GetChildrenCannedQueryTest-"+TEST_RUN_ID);
@@ -456,7 +456,68 @@ public class GetChildrenCannedQueryTest extends TestCase
results = list(parentNodeRef, -1, -1, 0, childTypeQNames, null, null);
assertEquals(0, results.getPage().size());
}
public void testPrimaryVsSecondary() throws Exception
{
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
NodeRef userHomeRef = repositoryHelper.getCompanyHome();
NodeRef parentNodeRef1 = createFolder(userHomeRef, "GetChildrenCannedQueryTest-PrimaryVsSecondary-"+TEST_RUN_ID, ContentModel.TYPE_FOLDER);
PagingResults<NodeRef> results = list(parentNodeRef1, -1, -1, 0, null, null, null);
assertEquals(0, results.getPage().size());
List<FilterProp> filterPropsPrimary = new ArrayList<>(1);
filterPropsPrimary.add(new FilterPropBoolean(GetChildrenCannedQuery.FILTER_QNAME_NODE_IS_PRIMARY, true));
List<FilterProp> filterPropsSecondary = new ArrayList<>(1);
filterPropsSecondary.add(new FilterPropBoolean(GetChildrenCannedQuery.FILTER_QNAME_NODE_IS_PRIMARY, false));
results = list(parentNodeRef1, -1, -1, 0, null, filterPropsPrimary, null);
assertEquals(0, results.getPage().size());
results = list(parentNodeRef1, -1, -1, 0, null, filterPropsSecondary, null);
assertEquals(0, results.getPage().size());
NodeRef folder1Ref = createFolder(parentNodeRef1, FOLDER_1, ContentModel.TYPE_FOLDER);
NodeRef folder2Ref = createFolder(parentNodeRef1, FOLDER_2, ContentModel.TYPE_FOLDER);
results = list(parentNodeRef1, -1, -1, 0, null, null, null);
assertEquals(2, results.getPage().size());
assertTrue(results.getPage().contains(folder1Ref));
assertTrue(results.getPage().contains(folder2Ref));
results = list(parentNodeRef1, -1, -1, 0, null, filterPropsPrimary, null);
assertEquals(2, results.getPage().size());
assertTrue(results.getPage().contains(folder1Ref));
assertTrue(results.getPage().contains(folder2Ref));
results = list(parentNodeRef1, -1, -1, 0, null, filterPropsSecondary, null);
assertEquals(0, results.getPage().size());
NodeRef parentNodeRef2 = getOrCreateParentTestFolder("GetChildrenCannedQueryTest-2-"+TEST_RUN_ID);
NodeRef folder3Ref = createFolder(parentNodeRef2, FOLDER_3, ContentModel.TYPE_FOLDER);
nodeService.addChild(parentNodeRef1, folder3Ref, ContentModel.ASSOC_CONTAINS, QName.createQName("cm:2nd"));
results = list(parentNodeRef1, -1, -1, 0, null, null, null);
assertEquals(3, results.getPage().size());
assertTrue(results.getPage().contains(folder1Ref));
assertTrue(results.getPage().contains(folder2Ref));
assertTrue(results.getPage().contains(folder3Ref));
results = list(parentNodeRef1, -1, -1, 0, null, filterPropsPrimary, null);
assertEquals(2, results.getPage().size());
assertTrue(results.getPage().contains(folder1Ref));
assertTrue(results.getPage().contains(folder2Ref));
results = list(parentNodeRef1, -1, -1, 0, null, filterPropsSecondary, null);
assertEquals(1, results.getPage().size());
assertTrue(results.getPage().contains(folder3Ref));
}
public void testPropertyStringFiltering() throws Exception
{
NodeRef parentNodeRef = getOrCreateParentTestFolder("GetChildrenCannedQueryTest-"+TEST_RUN_ID);