Author: skygo
Date: Tue Sep 4 11:05:57 2012
New Revision: 1380551
URL: http://svn.apache.org/viewvc?rev=1380551&view=rev
Log:
refactoring of redback-rbac tests
handle CachedRbacManagerTest.java a different way.
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.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-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java?rev=1380551&r1=1380550&r2=1380551&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
Tue Sep 4 11:05:57 2012
@@ -27,6 +27,7 @@ import org.junit.Before;
import javax.inject.Inject;
import javax.inject.Named;
import org.junit.After;
+import org.junit.BeforeClass;
import org.springframework.test.annotation.DirtiesContext;
@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
@@ -38,6 +39,28 @@ public class CachedRbacManagerTest
@Named( value = "rBACManager#cached" )
RBACManager rbacManager;
+ @BeforeClass
+ public static void dummyInit()
+ {
+ EVENTCOUNT = 1;
+ }
+
+ /*
+ * event count workflow in cachedRbacMaanger is not working like JDO or
Memory provider
+ * trigger doesnt exist here.
+ * first test throw 1 event
+ * second test and after throw 2 events
+ */
+ @Override
+ public void assertEventCount()
+ {
+ assertEquals( EVENTCOUNT, eventTracker.initCount );
+ if ( EVENTCOUNT == 1 )
+ {
+ EVENTCOUNT++;
+ }
+ }
+
/**
* Creates a new RbacStore which contains no data.
*/
@@ -70,8 +93,6 @@ public class CachedRbacManagerTest
{
CacheManager.getInstance().clearAll();
rbacManager.eraseDatabase();
- //eventTracker.rbacInit( true );
super.testStoreInitialization();
- assertEquals( EVENTCOUNT-1, eventTracker.initCount );
}
}
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java?rev=1380551&r1=1380550&r2=1380551&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
Tue Sep 4 11:05:57 2012
@@ -60,6 +60,12 @@ public class JdoRbacManagerTest
@Named( value = "rBACManager#jdo" )
RBACManager rbacManager;
+ @Override
+ public void assertEventCount()
+ {
+ assertEquals( EVENTCOUNT, eventTracker.initCount );
+ }
+
/**
* Creates a new RbacStore which contains no data.
*/
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java?rev=1380551&r1=1380550&r2=1380551&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
Tue Sep 4 11:05:57 2012
@@ -42,6 +42,12 @@ public class MemoryRbacManagerTest
@Named (value = "rBACManager#memory")
RBACManager rbacManager;
+ @Override
+ public void assertEventCount()
+ {
+ assertEquals( EVENTCOUNT, eventTracker.initCount );
+ }
+
/**
* Creates a new RbacStore which contains no data.
*/
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=1380551&r1=1380550&r2=1380551&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 Sep 4 11:05:57 2012
@@ -131,6 +131,27 @@ public abstract class AbstractRbacManage
return role;
}
+ public abstract void assertEventCount();
+
+ private void assertEventTracker(int addedRoleNameCount, int
removedRoleNameCount,
+ int addedPermissionNames, int removedPermissionNames,
+ boolean freshness, boolean eventCount )
+ {
+ assertNotNull( eventTracker );
+ if ( eventCount )
+ {
+ assertEventCount();
+ }
+ assertEquals( addedRoleNameCount, eventTracker.addedRoleNames.size() );
+ assertEquals( removedRoleNameCount,
eventTracker.removedRoleNames.size() );
+ assertEquals( addedPermissionNames,
eventTracker.addedPermissionNames.size() );
+ assertEquals( removedPermissionNames,
eventTracker.removedPermissionNames.size() );
+ if ( freshness )
+ {
+ assertTrue( eventTracker.lastDbFreshness.booleanValue() );
+ }
+ }
+
@Test
public void testStoreInitialization()
throws Exception
@@ -152,14 +173,9 @@ public abstract class AbstractRbacManage
assertEquals( 0, rbacManager.getAllRoles().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- //assertEquals( 1, eventTracker.initCount ); // test is done in
overrided methods
+ assertEventTracker( 1, 1, 1, 0, false, false );
//assertTrue( eventTracker.lastDbFreshness.booleanValue() );
- assertEquals( 1, eventTracker.addedRoleNames.size() );
- assertEquals( 1, eventTracker.removedRoleNames.size() );
- assertEquals( 1, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
}
@Test
@@ -188,14 +204,8 @@ public abstract class AbstractRbacManage
assertEquals( 1, rbacManager.getAllResources().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 0, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 0, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 0, 0, 0, 0, true, true );
+
}
@Test
@@ -227,14 +237,8 @@ public abstract class AbstractRbacManage
assertNotNull( fetched );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
+ assertEventTracker( 2, 0, 3, 0, true, true);
- assertEquals( 2, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 3, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
}
@Test
@@ -258,14 +262,7 @@ public abstract class AbstractRbacManage
assertEquals( develRole, actualDevel );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 2, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 2, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 2, 0, 2, 0, true, true);
}
@Test
@@ -293,14 +290,7 @@ public abstract class AbstractRbacManage
assertEquals( 0, rbacManager.getAllPermissions().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 1, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 0, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 1, 0, 0, 0, true, true);
}
@Test
@@ -332,14 +322,7 @@ public abstract class AbstractRbacManage
assertEquals( 3, manager.getAllRoles().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 3, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 3, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 3, 0, 3, 0, true, true);
}
@Test
@@ -374,14 +357,7 @@ public abstract class AbstractRbacManage
assertEquals( 3, manager.getAllRoles().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 3, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 3, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 3, 0, 3, 0, true, true);
}
@Test
@@ -415,14 +391,7 @@ public abstract class AbstractRbacManage
assertNotNull( fetched );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 1, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 1, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 1, 0, 1, 0, true, true);
}
@Test
@@ -479,14 +448,7 @@ public abstract class AbstractRbacManage
assertEquals( 1, assignedPermissions.size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 1, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 1, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 1, 0, 1, 0, true, true);
}
@Test
@@ -515,14 +477,7 @@ public abstract class AbstractRbacManage
assertEquals( 1, manager.getAllResources().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 0, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 2, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 0, 0, 2, 0, true, true);
}
@Test
@@ -538,14 +493,7 @@ public abstract class AbstractRbacManage
manager.createPermission( "Delete Configuration",
"delete-configuration", Resource.GLOBAL ) );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 0, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 2, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 0, 0, 2, 0, true, true);
}
@Test
@@ -610,14 +558,8 @@ public abstract class AbstractRbacManage
assertEquals( "Should have 2 assignable roles.", 2,
manager.getUnassignedRoles( bob.getPrincipal() ).size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
+ assertEventTracker( 2, 0, 2, 0, true, true);
- assertEquals( 2, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 2, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
}
@Test
@@ -649,14 +591,8 @@ public abstract class AbstractRbacManage
assertEquals( 1, assignment.getRoleNames().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
+ assertEventTracker( 1, 0, 1, 0, true, true);
- assertEquals( 1, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 1, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
}
@Test
@@ -695,14 +631,7 @@ public abstract class AbstractRbacManage
assertEquals( 1, assignment.getRoleNames().size() );
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount ); // XXX failing
sometimes with cached
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
-
- assertEquals( 2, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 1, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
+ assertEventTracker( 2, 0, 1, 0, true, true );
}
@Test
@@ -834,14 +763,8 @@ public abstract class AbstractRbacManage
}
/* Assert some event tracker stuff */
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
+ assertEventTracker( 2, 0, 2, 0, true, true);
- assertEquals( 2, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 2, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
}
@Test
@@ -880,6 +803,7 @@ public abstract class AbstractRbacManage
public void testGetAssignedPermissionsDeep()
throws RbacManagerException
{
+ assertNotNull( rbacManager );
rbacDefaults.createDefaults();
// Setup User / Assignment with 1 role.
@@ -906,7 +830,7 @@ public abstract class AbstractRbacManage
public void testLargeApplicationInit()
throws RbacManagerException
{
-
+ assertNotNull( rbacManager );
rbacManager.eraseDatabase();
rbacDefaults.createDefaults();
assertEquals( 6, rbacManager.getAllPermissions().size() );
@@ -965,14 +889,8 @@ public abstract class AbstractRbacManage
}
// Assert some event tracker stuff
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
+ assertEventTracker( 2, 0, 3, 0, true, true);
- assertEquals( 2, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 3, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
}
@Test
@@ -1027,14 +945,8 @@ public abstract class AbstractRbacManage
}
// Assert some event tracker stuff
- assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
- assertTrue( eventTracker.lastDbFreshness.booleanValue() );
+ assertEventTracker( 2, 0, 3, 0, true, true);
- assertEquals( 2, eventTracker.addedRoleNames.size() );
- assertEquals( 0, eventTracker.removedRoleNames.size() );
- assertEquals( 3, eventTracker.addedPermissionNames.size() );
- assertEquals( 0, eventTracker.removedPermissionNames.size() );
}
/**
