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

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
103946: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103861: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         103837: MNT-13867: Merged V4.1-BUG-FIX to V4.2-BUG-FIX (4.2.5).
            101406: MNT-12454: Deletion behaviour of LDAP user does NOT work as documented.
                       - was added synchronization.syncDelete property.
            101558: MNT-12454: Deletion behaviour of LDAP user does NOT work as documented.
                       - If allowDeletions=true then authority need move to AuthorityService.ZONE_AUTH_ALFRESCO. ChainingUserRegistrySynchronizerTest.testForcedUpdateWithoutDeletions test was corrected. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-05-12 15:32:27 +00:00
parent 7280363ce8
commit 04916eb008
5 changed files with 73 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/test-java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizerTest.java
View File

@@ -432,8 +432,8 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
public Object execute() throws Throwable
{
// MNT-9711 fix. User U6 already exists in zone "Z0". According ChainingUserRegistrySynchronizercurrent
// implementation when allowDeletions==false person that exists in a different zone with higher
// MNT-13867 fix. User U6 already exists in zone "Z0". According ChainingUserRegistrySynchronizercurrent
// implementation when syncDelete==false person that exists in a different zone with higher
// precedence will be ignored
assertExists("Z0", "U6");
assertExists("Z1", "U1");
@@ -797,8 +797,10 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
// Check in correct zone
if (zone == null)
{
assertEquals(Collections.singleton(AuthorityService.ZONE_APP_DEFAULT), this.authorityService
.getAuthorityZones(longName));
Set<String> zones = new TreeSet<String>();
zones.add(AuthorityService.ZONE_APP_DEFAULT);
zones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
assertEquals(zones, this.authorityService.getAuthorityZones(longName));
}
else
{