Author: olamy
Date: Tue Jan 15 13:22:31 2013
New Revision: 1433397
URL: http://svn.apache.org/viewvc?rev=1433397&view=rev
Log:
fix more unit tests
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/security.properties
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java?rev=1433397&r1=1433396&r2=1433397&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/AbstractRBACManager.java
Tue Jan 15 13:22:31 2013
@@ -35,7 +35,6 @@ import java.util.Set;
* AbstractRBACManager
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
public abstract class AbstractRBACManager
implements RBACManager
@@ -316,6 +315,7 @@ public abstract class AbstractRBACManage
}
public boolean roleExists( Role role )
+ throws RbacManagerException
{
try
{
@@ -328,6 +328,7 @@ public abstract class AbstractRBACManage
}
public boolean roleExists( String name )
+ throws RbacManagerException
{
try
{
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java?rev=1433397&r1=1433396&r2=1433397&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
Tue Jan 15 13:22:31 2013
@@ -27,6 +27,7 @@ import org.apache.archiva.redback.common
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationKeys;
+import org.apache.archiva.redback.rbac.AbstractRBACManager;
import org.apache.archiva.redback.rbac.AbstractRole;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
@@ -66,6 +67,7 @@ import java.util.Set;
*/
@Service( "rbacManager#ldap" )
public class LdapRbacManager
+ extends AbstractRBACManager
implements RBACManager, RBACManagerListener
{
@@ -268,12 +270,12 @@ public class LdapRbacManager
return this.rbacImpl.getAssignedPermissionMap( username );
}
- public Set<Permission> getAssignedPermissions( String username )
+ /*public Set<Permission> getAssignedPermissions( String username )
throws RbacObjectNotFoundException, RbacManagerException
{
// TODO here !!
return this.rbacImpl.getAssignedPermissions( username );
- }
+ }*/
private List<Role> mapToRoles( List<String> groups )
throws MappingException, RbacManagerException
@@ -414,8 +416,18 @@ public class LdapRbacManager
public UserAssignment getUserAssignment( String username )
throws RbacObjectNotFoundException, RbacManagerException
{
- // TODO here !!
- return this.rbacImpl.getUserAssignment( username );
+ try
+ {
+ List<String> roles = ldapRoleMapper.getRoles( username );
+
+ return new UserAssignmentImpl( username, roles );
+ }
+ catch ( MappingException e )
+ {
+ throw new RbacManagerException( e.getMessage(), e );
+ }
+
+ //return this.rbacImpl.getUserAssignment( username );
}
public List<UserAssignment> getUserAssignmentsForRoles( Collection<String>
roleNames )
@@ -584,6 +596,7 @@ public class LdapRbacManager
return this.rbacImpl.resourceExists( identifier );
}
+ @Override
public boolean roleExists( Role role )
throws RbacManagerException
{
@@ -835,6 +848,16 @@ public class LdapRbacManager
{
// no op
}
+
+ @Override
+ public String toString()
+ {
+ final StringBuilder sb = new StringBuilder();
+ sb.append( "RoleImpl" );
+ sb.append( "{name='" ).append( name ).append( '\'' );
+ sb.append( '}' );
+ return sb.toString();
+ }
}
private static class UserAssignmentImpl
@@ -925,5 +948,17 @@ public class LdapRbacManager
{
this.permanent = permanent;
}
+
+ @Override
+ public String toString()
+ {
+ final StringBuilder sb = new StringBuilder();
+ sb.append( "UserAssignmentImpl" );
+ sb.append( "{username='" ).append( username ).append( '\'' );
+ sb.append( ", roleNames=" ).append( roleNames );
+ sb.append( ", permanent=" ).append( permanent );
+ sb.append( '}' );
+ return sb.toString();
+ }
}
}
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/security.properties
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/security.properties?rev=1433397&r1=1433396&r2=1433397&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/security.properties
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/security.properties
Tue Jan 15 13:22:31 2013
@@ -21,6 +21,7 @@ ldap.config.groups.role.user-admin=User
ldap.config.groups.role.sys-admin=System Administrator
ldap.config.groups.role.trusted-dev=Trusted Developer
ldap.config.groups.role.developer=Developer
+ldap.config.groups.role.thetestrole=Test Role
ldap.config.base.dn=dc=archiva,dc=apache,dc=org
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java?rev=1433397&r1=1433396&r2=1433397&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/AbstractRbacManagerTestCase.java
Tue Jan 15 13:22:31 2013
@@ -383,7 +383,7 @@ public abstract class AbstractRbacManage
manager.saveUserAssignment( assignment );
- assertEquals( 1, manager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
manager.getAllUserAssignments().size() );
assertEquals( 1, manager.getAllRoles().size() );
UserAssignment ua = manager.getUserAssignment( adminPrincipal );
@@ -432,7 +432,7 @@ public abstract class AbstractRbacManage
admin = manager.saveRole( admin );
- assertEquals( 1, manager.getAllRoles().size() );
+ assertEquals( incAssignements( 1 ), manager.getAllRoles().size() );
String adminPrincipal = "admin";
@@ -442,7 +442,7 @@ public abstract class AbstractRbacManage
manager.saveUserAssignment( ua );
- assertEquals( 1, manager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
manager.getAllUserAssignments().size() );
Set<Permission> assignedPermissions = manager.getAssignedPermissions(
adminPrincipal );
@@ -516,7 +516,7 @@ public abstract class AbstractRbacManage
assignment.addRoleName( developerRole );
manager.saveUserAssignment( assignment );
- assertEquals( 1, manager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
manager.getAllUserAssignments().size() );
assertEquals( 1, manager.getAllRoles().size() );
// Create another role add it to manager.
@@ -529,7 +529,7 @@ public abstract class AbstractRbacManage
bob.addRoleName( projectAdminRoleName );
bob = manager.saveUserAssignment( bob );
- assertEquals( 1, manager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
manager.getAllUserAssignments().size() );
assertEquals( 2, manager.getAllRoles().size() );
assertEquals( 2, bob.getRoleNames().size() );
assertEquals( 0, manager.getUnassignedRoles( bob.getPrincipal()
).size() );
@@ -582,7 +582,7 @@ public abstract class AbstractRbacManage
assignment.addRoleName( devRole );
assignment = manager.saveUserAssignment( assignment );
- assertEquals( 1, manager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
manager.getAllUserAssignments().size() );
assertEquals( 1, manager.getAllRoles().size() );
// assign the same role again to the same user
@@ -618,7 +618,7 @@ public abstract class AbstractRbacManage
assignment.addRoleName( devRole );
assignment = manager.saveUserAssignment( assignment );
- assertEquals( 1, manager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
manager.getAllUserAssignments().size() );
assertEquals( "should be only one role assigned", 1,
manager.getAssignedRoles( assignment.getPrincipal()
).size() );
assertEquals( "should be one role left to assign", 1,
@@ -707,7 +707,8 @@ public abstract class AbstractRbacManage
assignment.addRoleName( roleName );
manager.saveUserAssignment( assignment );
- Assertions.assertThat( manager.getAllUserAssignments()
).isNotNull().isNotEmpty().hasSize( 1 );
+ Assertions.assertThat( manager.getAllUserAssignments()
).isNotNull().isNotEmpty().hasSize(
+ incAssignements( 1 ) );
Assertions.assertThat( manager.getAllRoles()
).isNotNull().isNotEmpty().hasSize( 3 );
Assertions.assertThat( manager.getAllPermissions()
).isNotNull().isNotEmpty().hasSize( 3 );
@@ -795,7 +796,7 @@ public abstract class AbstractRbacManage
assignment.addRoleName( "Developer" );
rbacManager.saveUserAssignment( assignment );
- assertEquals( 1, rbacManager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
rbacManager.getAllUserAssignments().size() );
assertEquals( 4, rbacManager.getAllRoles().size() );
assertEquals( 6, rbacManager.getAllPermissions().size() );
@@ -827,7 +828,7 @@ public abstract class AbstractRbacManage
assignment.addRoleName( "Developer" );
rbacManager.saveUserAssignment( assignment );
- assertEquals( 1, rbacManager.getAllUserAssignments().size() );
+ assertEquals( incAssignements( 1 ),
rbacManager.getAllUserAssignments().size() );
assertEquals( 6, rbacManager.getAllPermissions().size() );
assertEquals( 4, rbacManager.getAllRoles().size() );
