inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
126451 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      122140 jvonka: Nodes (FileFolder) API - update listChildren 'where' filtering (inc tests) for nodeType + optionally including sub-types
      - for example: where=(nodeType='cm:link includeSubTypes')
      RA-811, RA-634


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 11:22:40 +00:00
parent 5b8acc631d
commit c7c51c4ec4
2 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -1484,7 +1484,7 @@ public class NodeApiTest extends AbstractBaseApiTest
n1.expected(nodeResp);
// filtering, via where clause (nodeType + subTypes)
// filtering, via where clause (nodeType + optionally including sub-types)
// note: subtle issue - in order to filter by "cm:link" the qname must have been created in the DB (in a write txn)
// otherwise query will not match a missing qname (hmm). Workaround here by forcing the create of an explicit "cm:link".
@@ -1505,11 +1505,23 @@ public class NodeApiTest extends AbstractBaseApiTest
response = getAll(getChildrenUrl(f2Id), user1, paging, params, 200);
List<Node> nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Node.class);
assertEquals(1, nodes.size());
// filter by including sub-types - note: includesubtypes is case-insensitive
params = new HashMap<>();
params.put("where", "(nodeType='cm:link' and subTypes=true)");
params.put("where", "(nodeType='cm:link INCLUDESUBTYPES')");
paging = getPaging(0, Integer.MAX_VALUE);
response = getAll(getChildrenUrl(f2Id), user1, paging, params, 200);
nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Node.class);
assertEquals(3, nodes.size());
assertTrue(linkIds.contains(nodes.get(0).getId()));
assertTrue(linkIds.contains(nodes.get(1).getId()));
params = new HashMap<>();
params.put("where", "(nodeType='cm:link includeSubTypes')");
paging = getPaging(0, Integer.MAX_VALUE);
@@ -1549,6 +1561,15 @@ public class NodeApiTest extends AbstractBaseApiTest
params = new HashMap<>();
params.put("where", "(nodeType='my:unknown'");
getAll(getChildrenUrl(f2Id), user1, paging, params, 400);
// -ver test - invalid node type localname format and suffix is not ' includesubtypes'
params = new HashMap<>();
params.put("where", "(nodeType='cm:link ')");
getAll(getChildrenUrl(f2Id), user1, paging, params, 400);
params = new HashMap<>();
params.put("where", "(nodeType='cm:link blah')");
getAll(getChildrenUrl(f2Id), user1, paging, params, 400);
}