Author: [email protected]
Date: Wed Jul 27 18:12:07 2011
New Revision: 1230
Log:
AMDATU-404 test and code accepts a null filter
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProvider.java
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProviderTest.java
Modified:
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProvider.java
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProvider.java
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/main/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProvider.java
Wed Jul 27 18:12:07 2011
@@ -232,9 +232,12 @@
List<Role> matchingRoles = new LinkedList<Role>();
try {
List<FSRole> internalRoles = m_storage.getAll();
- Filter filter = FrameworkUtil.createFilter(filterString);
+ Filter filter = null;
+ if(filterString != null){
+ filter = FrameworkUtil.createFilter(filterString);
+ }
for (FSRole internalRole : internalRoles) {
- if (filter.match(internalRole.getProperties())) {
+ if (filter == null ||
filter.match(internalRole.getProperties())) {
matchingRoles.add(internalRole);
}
}
Modified:
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProviderTest.java
==============================================================================
---
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProviderTest.java
(original)
+++
trunk/amdatu-core/useradminstore-fs/src/test/java/org/amdatu/core/useradminstore/fs/service/FSUserAdminStorageProviderTest.java
Wed Jul 27 18:12:07 2011
@@ -233,6 +233,10 @@
Collection<Role> matches3 =
m_userAdminStorageProvider.findRoles(m_userAdminFactory, "(status=n00b)");
Assert.assertEquals("Find returned unexpected amount of roles", 0,
matches3.size());
+
+ // AMDATU-404 check that null filter return all roles
+ Collection<Role> matches4 =
m_userAdminStorageProvider.findRoles(m_userAdminFactory, null);
+ Assert.assertEquals("Find returned unexpected amount of roles", 2,
matches4.size());
}
@Test
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
