Fix ALFCOM-2428: CMIS: REST/Atom: SQL query on Folders

- specific bug raised has been already fixed, but added new case to testQuery()
- fixed minor issue found by test
   - content stream link for folder no longer rendered

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-03-05 12:10:38 +00:00
parent e82e2067ce
commit 028fd7b6a0
2 changed files with 35 additions and 9 deletions

View File

@@ -1249,6 +1249,27 @@ public class CMISTest extends BaseCMISWebScriptTest
// retrieve query request document
String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml");
{
// construct structured query
String query = "SELECT * FROM Folder " +
"WHERE ObjectId = '" + testFolderObject.getObjectId().getValue() + "'";
String queryReq = queryDoc.replace("${STATEMENT}", query);
queryReq = queryReq.replace("${SKIPCOUNT}", "0");
queryReq = queryReq.replace("${PAGESIZE}", "5");
// issue structured query
Response queryRes = sendRequest(new PostRequest(queryHREF.toString(), queryReq.getBytes(), CMISConstants.MIMETYPE_QUERY), 200);
assertNotNull(queryRes);
Feed queryFeed = abdera.parseFeed(new StringReader(queryRes.getContentAsString()), null);
assertNotNull(queryFeed);
assertEquals(1, queryFeed.getEntries().size());
assertNotNull(queryFeed.getEntry(testFolder.getId().toString()));
CMISObject result1 = queryFeed.getEntry(testFolder.getId().toString()).getExtension(CMISConstants.OBJECT);
assertEquals(testFolderObject.getName().getValue(), result1.getName().getValue());
assertEquals(testFolderObject.getObjectId().getValue(), result1.getObjectId().getValue());
assertEquals(testFolderObject.getObjectTypeId().getValue(), result1.getObjectTypeId().getValue());
}
{
// construct structured query
String query = "SELECT * FROM Document " +
@@ -1270,7 +1291,7 @@ public class CMISTest extends BaseCMISWebScriptTest
assertEquals(document1Object.getObjectId().getValue(), result1.getObjectId().getValue());
assertEquals(document1Object.getObjectTypeId().getValue(), result1.getObjectTypeId().getValue());
}
if (fulltextCapability.equals("fulltextonly") || fulltextCapability.equals("fulltextandstructured"))
{
// construct fulltext query