From 5b076c79d19b6645abb2331ccbc2576a5b3a93a9 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Thu, 22 Dec 2005 01:22:09 +0000 Subject: [PATCH] Changed to use a Set rather than array index to check for the presence of granted authorities as the ordering of the latter couldn't be guaranteed. --- .../userdetails/jdbc/JdbcDaoTests.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java b/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java index a237cd36bc..6afb6c1b98 100644 --- a/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java +++ b/core/src/test/java/org/acegisecurity/userdetails/jdbc/JdbcDaoTests.java @@ -26,6 +26,8 @@ import org.springframework.jdbc.object.MappingSqlQuery; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.Arrays; +import java.util.HashSet; /** @@ -61,9 +63,11 @@ public class JdbcDaoTests extends TestCase { assertEquals("marissa", user.getUsername()); assertEquals("koala", user.getPassword()); assertTrue(user.isEnabled()); - assertEquals("ROLE_TELLER", user.getAuthorities()[1].getAuthority()); - assertEquals("ROLE_SUPERVISOR", user.getAuthorities()[0].getAuthority()); - assertEquals(2, user.getAuthorities().length); + HashSet authorities = new HashSet(2); + authorities.add(user.getAuthorities()[0].getAuthority()); + authorities.add(user.getAuthorities()[1].getAuthority()); + assertTrue(authorities.contains("ROLE_TELLER")); + assertTrue(authorities.contains("ROLE_SUPERVISOR")); } public void testCheckDaoOnlyReturnsGrantedAuthoritiesGrantedToUser() @@ -125,11 +129,12 @@ public class JdbcDaoTests extends TestCase { UserDetails user = dao.loadUserByUsername("marissa"); assertEquals("marissa", user.getUsername()); - assertEquals("ARBITRARY_PREFIX_ROLE_TELLER", - user.getAuthorities()[1].getAuthority()); - assertEquals("ARBITRARY_PREFIX_ROLE_SUPERVISOR", - user.getAuthorities()[0].getAuthority()); assertEquals(2, user.getAuthorities().length); + HashSet authorities = new HashSet(2); + authorities.add(user.getAuthorities()[0].getAuthority()); + authorities.add(user.getAuthorities()[1].getAuthority()); + assertTrue(authorities.contains("ARBITRARY_PREFIX_ROLE_TELLER")); + assertTrue(authorities.contains("ARBITRARY_PREFIX_ROLE_SUPERVISOR")); } public void testStartupFailsIfDataSourceNotSet() throws Exception {