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 
59889: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59662: Merged V4.2.1 (4.2.1) to V4.2-BUG-FIX (4.2.2)
         59613: Merged DEV to V4.2.1
            59345: MNT-10267: Authority Search does not work for groups with Unicode display name
             - Modify GetAuthoritiesCannedQuery to respect unicode. 
            59514: MNT-10267: Authority Search does not work for groups with Unicode display name
             - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 09:22:30 +00:00
parent 6c45b22b37
commit cf9cbbed5f
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
View File

@@ -140,7 +140,7 @@ public class GetAuthoritiesCannedQuery extends AbstractCannedQueryPermissions<Au
.replaceAll("\\>", "\\\\>") .replaceAll("\\>", "\\\\>")
.replaceAll("\\/", "\\\\/") .replaceAll("\\/", "\\\\/")
.replaceAll("\\|", "\\\\|"); .replaceAll("\\|", "\\\\|");
return Pattern.compile(searchValue, Pattern.CASE_INSENSITIVE); return Pattern.compile(searchValue, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
} }
private class AuthComparator implements Comparator<AuthorityInfo> private class AuthComparator implements Comparator<AuthorityInfo>

14
source/test-java/org/alfresco/repo/security/authority/script/ScriptAuthorityServiceTest.java
View File

@@ -67,6 +67,8 @@ public class ScriptAuthorityServiceTest extends TestCase
private static final String GROUP_B_FULL = "GROUP_testGroupB"; private static final String GROUP_B_FULL = "GROUP_testGroupB";
private static final String GROUP_C = "testGroupC"; private static final String GROUP_C = "testGroupC";
private static final String GROUP_C_FULL = "GROUP_testGroupC"; private static final String GROUP_C_FULL = "GROUP_testGroupC";
private static final String GROUP_RUS = "MNT10267RUS";
private static final String GROUP_RUS_FULL = "GROUP_MNT10267RUS";
private static final String USER_A = "testUserA"; private static final String USER_A = "testUserA";
private static final String USER_B = "testUserB"; private static final String USER_B = "testUserB";
private static final String USER_C = "testUserC"; private static final String USER_C = "testUserC";
@@ -154,6 +156,10 @@ public class ScriptAuthorityServiceTest extends TestCase
{ {
authorityService.deleteAuthority(GROUP_C_FULL); authorityService.deleteAuthority(GROUP_C_FULL);
} }
if (authorityService.authorityExists(GROUP_RUS_FULL))
{
authorityService.deleteAuthority(GROUP_RUS_FULL);
}
tx.commit(); tx.commit();
// Now re-create them // Now re-create them
@@ -163,6 +169,8 @@ public class ScriptAuthorityServiceTest extends TestCase
authorityService.createAuthority(AuthorityType.GROUP, GROUP_A); authorityService.createAuthority(AuthorityType.GROUP, GROUP_A);
authorityService.createAuthority(AuthorityType.GROUP, GROUP_B); authorityService.createAuthority(AuthorityType.GROUP, GROUP_B);
authorityService.createAuthority(AuthorityType.GROUP, GROUP_C); authorityService.createAuthority(AuthorityType.GROUP, GROUP_C);
String authRus = authorityService.createAuthority(AuthorityType.GROUP, GROUP_RUS);
pubAuthorityService.setAuthorityDisplayName(authRus, "Тестовая группа");
for (String user : new String[] { USER_A, USER_B, USER_C }) for (String user : new String[] { USER_A, USER_B, USER_C })
{ {
@@ -246,12 +254,16 @@ public class ScriptAuthorityServiceTest extends TestCase
// make sure we support getting all results // make sure we support getting all results
groups = service.getGroupsInZone("*", AuthorityService.ZONE_APP_DEFAULT, new ScriptPagingDetails(10,0), null); groups = service.getGroupsInZone("*", AuthorityService.ZONE_APP_DEFAULT, new ScriptPagingDetails(10,0), null);
assertEquals(5, groups.length); assertEquals(6, groups.length);
// ensure paging works, query for all results but just return 1 per page // ensure paging works, query for all results but just return 1 per page
groups = service.getGroupsInZone("test", AuthorityService.ZONE_APP_DEFAULT, new ScriptPagingDetails(2,2), "displayName"); groups = service.getGroupsInZone("test", AuthorityService.ZONE_APP_DEFAULT, new ScriptPagingDetails(2,2), "displayName");
assertEquals(1, groups.length); assertEquals(1, groups.length);
assertEquals(GROUP_C, groups[0].getShortName()); assertEquals(GROUP_C, groups[0].getShortName());
// make sure search works for unicode dispaly name
groups = service.getGroupsInZone("тест", AuthorityService.ZONE_APP_DEFAULT, new ScriptPagingDetails(10, 0), null, true);
assertEquals(1, groups.length);
} }
public void testFindGroups() public void testFindGroups()