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 (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
68121: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67187: MNT-10169 : Sort order by name is not always correct when the file name has alphanumeric characters
         - Fix for GetChildrenCannedQueryTest failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:09:19 +00:00
parent cfd0fd6436
commit cf5e452e77
3 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,6 +75,7 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.AlfrescoCollator;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.Pair;
import org.alfresco.util.PropertyMap;
@@ -83,6 +84,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
import org.springframework.extensions.surf.util.I18NUtil;
/**
* GetChildren canned query - simple unit tests
@@ -1051,7 +1053,7 @@ public class GetChildrenCannedQueryTest extends TestCase
logger.info("testSorting: "+count+" items ["+sortPropQName+","+(sortAscending ? " ascending" : " descending")+"]");
}
Collator collator = Collator.getInstance();
Collator collator = AlfrescoCollator.getInstance(I18NUtil.getContentLocale());
// check order
Serializable prevVal = null;