Merged 5.2.N (5.2.1) to HEAD (5.2)

125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:45:04 +00:00
parent 91eb2644ad
commit 12769c2923
830 changed files with 142534 additions and 142534 deletions

View File

@@ -1,52 +1,52 @@
package org.alfresco.repo.site;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
import junit.framework.TestCase;
public class RoleComparatorImplTest extends TestCase
{
public void testRoleComparator()
{
Map<String, Integer> rolePrecedence = new HashMap<String, Integer>();
rolePrecedence.put("SiteManager", 4);
rolePrecedence.put("SiteCollaborator", 3);
rolePrecedence.put("SiteContributor", 2);
rolePrecedence.put("SiteConsumer", 1);
Comparator<String> roleComparator = new RoleComparatorImpl(rolePrecedence);
List<String> roles = new ArrayList<String>();
roles.add("SiteConsumer");
assertEquals("SiteConsumer", sort(roles, roleComparator));
roles.add("SiteConsumer");
assertEquals("SiteConsumer", sort(roles, roleComparator));
roles.add("SiteContributor");
assertEquals("SiteContributor", sort(roles, roleComparator));
roles.add("SiteConsumer");
assertEquals("SiteContributor", sort(roles, roleComparator));
roles.add("SiteManager");
assertEquals("SiteManager", sort(roles, roleComparator));
roles.add("SiteCollaborator");
assertEquals("SiteManager", sort(roles, roleComparator));
}
private String sort(List<String> list, Comparator comparator)
{
SortedSet<String> sortedRoles = new TreeSet<String>(comparator);
for (String role : list)
{
sortedRoles.add(role);
}
return sortedRoles.first();
}
}
package org.alfresco.repo.site;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
import junit.framework.TestCase;
public class RoleComparatorImplTest extends TestCase
{
public void testRoleComparator()
{
Map<String, Integer> rolePrecedence = new HashMap<String, Integer>();
rolePrecedence.put("SiteManager", 4);
rolePrecedence.put("SiteCollaborator", 3);
rolePrecedence.put("SiteContributor", 2);
rolePrecedence.put("SiteConsumer", 1);
Comparator<String> roleComparator = new RoleComparatorImpl(rolePrecedence);
List<String> roles = new ArrayList<String>();
roles.add("SiteConsumer");
assertEquals("SiteConsumer", sort(roles, roleComparator));
roles.add("SiteConsumer");
assertEquals("SiteConsumer", sort(roles, roleComparator));
roles.add("SiteContributor");
assertEquals("SiteContributor", sort(roles, roleComparator));
roles.add("SiteConsumer");
assertEquals("SiteContributor", sort(roles, roleComparator));
roles.add("SiteManager");
assertEquals("SiteManager", sort(roles, roleComparator));
roles.add("SiteCollaborator");
assertEquals("SiteManager", sort(roles, roleComparator));
}
private String sort(List<String> list, Comparator comparator)
{
SortedSet<String> sortedRoles = new TreeSet<String>(comparator);
for (String role : list)
{
sortedRoles.add(role);
}
return sortedRoles.first();
}
}