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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
71614: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71278: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70686: Merged DEV to V4.1-BUG-FIX (4.1.9)
            70361: MNT-11120: FileFolderService.list does not order properly
             - Check next sort properties if current are null for both nodes.
             - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:32:15 +00:00
parent 748acbfa8e
commit 6901888160
2 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,9 +404,16 @@ public class GetChildrenCannedQuery extends AbstractCannedQueryPermissions<NodeR
pv2 = node2.getVal(sortPropQName);
if (pv1 == null)
{
if(pv2 == null && sortProps.size() > 1)
{
return compareImpl(node1In, node2In, sortProps.subList(1, sortProps.size()));
}
else
{
return (pv2 == null ? 0 : -1);
}
}
else if (pv2 == null)
{
return 1;

100
source/test-java/org/alfresco/repo/model/filefolder/FileFolderServiceImplTest.java
View File

@@ -24,10 +24,12 @@ import java.io.OutputStream;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Set;
import java.util.Map.Entry;
import javax.transaction.Status;
import javax.transaction.UserTransaction;
@@ -1635,4 +1637,102 @@ public class FileFolderServiceImplTest extends TestCase
assertFalse(copyInfo.getName().contains("(Working Copy)"));
assertTrue(copyInfo.getName().substring(0, copyExtIndex).startsWith(checkedOutName.substring(0, origExtIndex)));
}
public void testSortingCustomFields()
{
// Test sorting based on MNT-11120
QName customPropA = QName.createQName(ContentModel.USER_MODEL_URI, "a");
QName customPropB = QName.createQName(ContentModel.USER_MODEL_URI, "b");
HashMap<String, Pair<QName, String>> customProps = new HashMap<String, Pair<QName, String>>();
customProps.put("A-foo", new Pair<QName, String>(customPropA, "foo"));
customProps.put("A-bar", new Pair<QName, String>(customPropA, "bar"));
customProps.put("A-null", new Pair<QName, String>(customPropA, null));
customProps.put("B-biz", new Pair<QName, String>(customPropB, "biz"));
customProps.put("B-baz", new Pair<QName, String>(customPropB, "baz"));
customProps.put("B-null", new Pair<QName, String>(customPropB, null));
NodeRef nodeRef = fileFolderService.create(workingRootNodeRef, "" + System.currentTimeMillis(), ContentModel.TYPE_CONTENT).getNodeRef();
NodeRef parentTestRef = fileFolderService.create(nodeRef, "parent", ContentModel.TYPE_CONTENT).getNodeRef();
for (Entry<String, Pair<QName, String>> entry : customProps.entrySet())
{
NodeRef child = fileFolderService.create(parentTestRef, entry.getKey(), ContentModel.TYPE_CONTENT).getNodeRef();
nodeService.setProperty(child, entry.getValue().getFirst(), entry.getValue().getSecond());
}
List<Pair<QName, Boolean>> sortProps = new ArrayList<Pair<QName, Boolean>>();
PagingRequest pagingRequest = new PagingRequest(100, null);
// {("user:a", true),("user:b", true")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropA, true));
sortProps.add(new Pair<QName, Boolean>(customPropB, true));
PagingResults<FileInfo> results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
List<FileInfo> pageRes = results.getPage();
String[] expectedNames = new String[] { "A-null", "B-null", "B-baz", "B-biz", "A-bar", "A-foo" };
checkFileList(pageRes, 6, 0, expectedNames);
// {("user:a", false),("user:b", true")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropA, false));
sortProps.add(new Pair<QName, Boolean>(customPropB, true));
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "A-foo", "A-bar", "A-null", "B-null", "B-baz", "B-biz" };
checkFileList(pageRes, 6, 0, expectedNames);
// {(\"user:a", true),("user:b", false")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropA, true));
sortProps.add(new Pair<QName, Boolean>(customPropB, false));
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "B-biz", "B-baz", "A-null", "B-null", "A-bar", "A-foo" };
checkFileList(pageRes, 6, 0, expectedNames);
// {(\"user:a", false),("user:b", false")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropA, false));
sortProps.add(new Pair<QName, Boolean>(customPropB, false));
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "A-foo", "A-bar", "B-biz", "B-baz", "A-null", "B-null" };
checkFileList(pageRes, 6, 0, expectedNames);
// {(\"user:b", true),("user:a", true")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropB, true));
sortProps.add(new Pair<QName, Boolean>(customPropA, true));
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "A-null", "B-null", "A-bar", "A-foo", "B-baz", "B-biz" };
checkFileList(pageRes, 6, 0, expectedNames);
// {("user:b", false),("user:a", true")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropB, false));
sortProps.add(new Pair<QName, Boolean>(customPropA, true));
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "B-biz", "B-baz", "A-null", "B-null", "A-bar", "A-foo" };
checkFileList(pageRes, 6, 0, expectedNames);
// {("user:b", true),("user:a", false")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropB, true));
sortProps.add(new Pair<QName, Boolean>(customPropA, false));
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "A-foo", "A-bar", "A-null", "B-null", "B-baz", "B-biz" };
checkFileList(pageRes, 6, 0, expectedNames);
// {("user:b", false),("user:a", false")}
sortProps.clear();
sortProps.add(new Pair<QName, Boolean>(customPropB, false));
sortProps.add(new Pair<QName, Boolean>(customPropA, false));
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "B-biz", "B-baz", "A-foo", "A-bar", "A-null", "B-null" };
checkFileList(pageRes, 6, 0, expectedNames);
// no sort
sortProps.clear();
results = fileFolderService.list(parentTestRef, true, false, null, sortProps, pagingRequest);
expectedNames = new String[] { "B-null", "A-foo", "A-bar", "B-baz", "A-null", "B-biz" };
checkFileList(pageRes, 6, 0, expectedNames);
}
}