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

Better debugging and toString() methods for GetChildCannedQuery (found while investigating ALF-10224)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-09-09 13:35:40 +00:00
parent e03abe5d16
commit 06fcddedc1
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQuery.java
View File

@@ -645,6 +645,12 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions<NodeR
this.propVals = propVals; this.propVals = propVals;
} }
@Override
public String toString()
{
return "FilterSortNode [nodeRef=" + nodeRef + ", propVals=" + propVals + "]";
}
public NodeRef getNodeRef() public NodeRef getNodeRef()
{ {
return nodeRef; return nodeRef;

23
source/java/org/alfresco/repo/node/getchildren/GetChildrenCannedQueryTest.java
View File

@@ -429,7 +429,7 @@ public class GetChildrenCannedQueryTest extends TestCase
} }
} }
public void DISABLED_testPropertySorting() throws Exception public void testPropertySorting() throws Exception
{ {
NodeRef parentNodeRef = repositoryHelper.getCompanyHome(); NodeRef parentNodeRef = repositoryHelper.getCompanyHome();
@@ -763,11 +763,15 @@ public class GetChildrenCannedQueryTest extends TestCase
// check order // check order
Serializable prevVal = null; Serializable prevVal = null;
NodeRef prevNodeRef = null;
int currentIteration = 0;
boolean allValsNull = true; boolean allValsNull = true;
for (NodeRef nodeRef : results.getPage()) for (NodeRef nodeRef : results.getPage())
{ {
currentIteration++;
Serializable val = null; Serializable val = null;
if (sortPropQName.equals(GetChildrenCannedQuery.SORT_QNAME_CONTENT_SIZE) || sortPropQName.equals(GetChildrenCannedQuery.SORT_QNAME_CONTENT_MIMETYPE)) if (sortPropQName.equals(GetChildrenCannedQuery.SORT_QNAME_CONTENT_SIZE) || sortPropQName.equals(GetChildrenCannedQuery.SORT_QNAME_CONTENT_MIMETYPE))
@@ -835,19 +839,30 @@ public class GetChildrenCannedQueryTest extends TestCase
} }
else else
{ {
fail("Unsupported sort type: "+val.getClass().getName()); fail("Unsupported sort type ("+nodeRef+"): "+val.getClass().getName());
} }
if (! sortAscending) if (! sortAscending)
{ {
assertTrue("Not descending: ["+sortPropQName+","+val+","+prevVal+"]", result <= 0); assertTrue(
"Not descending: \n" +
" Iteration: " + currentIteration + " out of " + count + "\n" +
" Previous: " + prevNodeRef + " had " + prevVal + "\n" +
" Current : " + nodeRef + " had " + val,
result <= 0);
} }
else else
{ {
assertTrue("Not ascending: ["+sortPropQName+","+val+","+prevVal+"]", result >= 0); assertTrue(
"Not ascending: \n" +
" Iteration: " + currentIteration + " out of " + count + "\n" +
" Previous: " + prevNodeRef + " had " + prevVal + "\n" +
" Current : " + nodeRef + " had " + val,
result >= 0);
} }
} }
prevVal = val; prevVal = val;
prevNodeRef = nodeRef;
} }
assertFalse("All values were null", allValsNull); assertFalse("All values were null", allValsNull);