From 25d6792ca14b60282a88402e6b4f05c8fbe2105b Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Sun, 16 Mar 2008 04:49:12 +0000 Subject: [PATCH] SEC-717: Resolve UserDetails.getAuthorities() sort logic issue. --- .../ContainerPortletAuthoritiesPopulatorTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/portlet/src/test/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java b/portlet/src/test/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java index 16dc728269..7e9f9cde1b 100644 --- a/portlet/src/test/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java +++ b/portlet/src/test/java/org/springframework/security/providers/portlet/populator/ContainerPortletAuthoritiesPopulatorTests.java @@ -74,9 +74,9 @@ public class ContainerPortletAuthoritiesPopulatorTests extends TestCase { populator.setRolesToCheck(createRolesToCheck()); UserDetails results = populator.getUserDetails(PortletTestUtils.createToken()); assertEquals(3, results.getAuthorities().length); - assertEquals(new GrantedAuthorityImpl(ContainerPortletAuthoritiesPopulator.DEFAULT_USER_ROLE), results.getAuthorities()[0]); - assertEquals(new GrantedAuthorityImpl(PortletTestUtils.TESTROLE1), results.getAuthorities()[1]); - assertEquals(new GrantedAuthorityImpl(PortletTestUtils.TESTROLE2), results.getAuthorities()[2]); + assertEquals(new GrantedAuthorityImpl(ContainerPortletAuthoritiesPopulator.DEFAULT_USER_ROLE), results.getAuthorities()[2]); + assertEquals(new GrantedAuthorityImpl(PortletTestUtils.TESTROLE1), results.getAuthorities()[0]); + assertEquals(new GrantedAuthorityImpl(PortletTestUtils.TESTROLE2), results.getAuthorities()[1]); } public void testGetGrantedAuthoritiesCustomPrefix() throws Exception { @@ -86,9 +86,9 @@ public class ContainerPortletAuthoritiesPopulatorTests extends TestCase { populator.setRolePrefix(prefix); UserDetails results = populator.getUserDetails(PortletTestUtils.createToken()); assertEquals(3, results.getAuthorities().length); - assertEquals(new GrantedAuthorityImpl(ContainerPortletAuthoritiesPopulator.DEFAULT_USER_ROLE), results.getAuthorities()[0]); - assertEquals(new GrantedAuthorityImpl(prefix + PortletTestUtils.PORTALROLE1), results.getAuthorities()[1]); - assertEquals(new GrantedAuthorityImpl(prefix + PortletTestUtils.PORTALROLE2), results.getAuthorities()[2]); + assertEquals(new GrantedAuthorityImpl(ContainerPortletAuthoritiesPopulator.DEFAULT_USER_ROLE), results.getAuthorities()[2]); + assertEquals(new GrantedAuthorityImpl(prefix + PortletTestUtils.PORTALROLE1), results.getAuthorities()[0]); + assertEquals(new GrantedAuthorityImpl(prefix + PortletTestUtils.PORTALROLE2), results.getAuthorities()[1]); } public void testGetGrantedAuthoritiesNullDefault() throws Exception {