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 
58817: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58784: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58617 : MNT-9711: ldap synchronization algorithm is not optimal
            - The verification for deleting permissions was added for the full synchronization.
            - The unit tests were modified according the new logic.
         58667 : MNT-9711: ldap synchronization algorithm is not optimal
            - Refactoring code. Removed unreachable code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 00:14:46 +00:00
parent bfa69dcca9
commit 5d0d4fb5ed
2 changed files with 25 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,22 +18,6 @@
*/
package org.alfresco.repo.security.sync;
import java.util.AbstractCollection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
import junit.framework.TestCase;
import org.alfresco.error.AlfrescoRuntimeException;
@@ -60,6 +44,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.context.support.StaticApplicationContext;
import java.util.*;
/**
* Tests the {@link ChainingUserRegistrySynchronizer} using a simulated {@link UserRegistry}.
*
@@ -444,15 +430,15 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
public Object execute() throws Throwable
{
assertExists("Z0", "U2");
assertExists("Z0", "U3");
assertExists("Z0", "U4");
// 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
// precedence will be ignored
assertExists("Z0", "U6");
assertExists("Z1", "U1");
assertExists("Z1", "U7");
assertExists("Z1", "G5");
assertExists("Z2", "G6", "U3", "U4", "G7");
assertExists("Z1", "U5");
assertExists("Z1", "u6");
assertExists(null, "U1");
assertExists(null, "U7");
assertExists(null, "G5");
assertExists(null, "G6");
return null;
}
}, false, true);