You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/15 14:22:52 UTC
svn commit: r1433398 - in /archiva/redback/redback-core/trunk/redback-rbac:
redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/
redback-rbac-tests/src/main/java/org/apache/archiva/redback/tests/
Author: olamy
Date: Tue Jan 15 13:22:52 2013
New Revision: 1433398
URL: http://svn.apache.org/viewvc?rev=1433398&view=rev
Log:
fix more unit tests
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java
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-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java?rev=1433398&r1=1433397&r2=1433398&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManagerTest.java Tue Jan 15 13:22:52 2013
@@ -297,4 +297,9 @@ public class LdapRbacManagerTest
{
return size + 1;
}
+
+ protected boolean supportChildRole()
+ {
+ return false;
+ }
}
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=1433398&r1=1433397&r2=1433398&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:52 2013
@@ -295,10 +295,26 @@ public abstract class AbstractRbacManage
assertEventTracker( 1, 0, 0, 0, true, true );
}
+ /**
+ * ldap doesn't support child roles
+ *
+ * @return
+ */
+ protected boolean supportChildRole()
+ {
+ return true;
+ }
+
@Test
public void testAddGetChildRole()
throws RbacManagerException
{
+ if ( !supportChildRole() )
+ {
+ log.info( "child role feature not supported by the RBACManager impl: {}",
+ rbacManager.getClass().getName() );
+ return;
+ }
RBACManager manager = rbacManager;
assertNotNull( manager );
@@ -383,7 +399,7 @@ public abstract class AbstractRbacManage
manager.saveUserAssignment( assignment );
- assertEquals( incAssignements( 1 ), manager.getAllUserAssignments().size() );
+ assertEquals( 1, manager.getAllUserAssignments().size() );
assertEquals( 1, manager.getAllRoles().size() );
UserAssignment ua = manager.getUserAssignment( adminPrincipal );
@@ -416,7 +432,7 @@ public abstract class AbstractRbacManage
assignment = manager.saveUserAssignment( assignment );
assertEquals( 1, assignment.getRoleNames().size() );
- assertEquals( 1, manager.getAssignedRoles( adminPrincipal ).size() );
+ assertEquals( incAssignements( 1 ), manager.getAssignedRoles( adminPrincipal ).size() );
}
@Test
@@ -432,7 +448,7 @@ public abstract class AbstractRbacManage
admin = manager.saveRole( admin );
- assertEquals( incAssignements( 1 ), manager.getAllRoles().size() );
+ assertEquals( 1, manager.getAllRoles().size() );
String adminPrincipal = "admin";
@@ -442,7 +458,7 @@ public abstract class AbstractRbacManage
manager.saveUserAssignment( ua );
- assertEquals( incAssignements( 1 ), manager.getAllUserAssignments().size() );
+ assertEquals( 1, manager.getAllUserAssignments().size() );
Set<Permission> assignedPermissions = manager.getAssignedPermissions( adminPrincipal );