Author: skygo
Date: Mon Sep 3 15:50:50 2012
New Revision: 1380277
URL: http://svn.apache.org/viewvc?rev=1380277&view=rev
Log:
continue to check for jdk7 unit test
try to change order of test to emphase non independant tests
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=1380277&r1=1380276&r2=1380277&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
Mon Sep 3 15:50:50 2012
@@ -26,7 +26,10 @@ import org.junit.Before;
import javax.inject.Inject;
import javax.inject.Named;
+import org.junit.After;
+import org.springframework.test.annotation.DirtiesContext;
+@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
public class CachedRbacManagerTest
extends AbstractRbacManagerTestCase
{
@@ -51,9 +54,10 @@ public class CachedRbacManagerTest
CacheManager.getInstance().clearAll();
setRbacManager( rbacManager );
- assertTrue( getRbacManager() instanceof CachedRbacManager );
+ assertTrue( getRbacManager() instanceof CachedRbacManager );
}
-
+
+ @After
public void tearDown()
throws Exception
{
@@ -68,5 +72,6 @@ public class CachedRbacManagerTest
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=1380277&r1=1380276&r2=1380277&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
Mon Sep 3 15:50:50 2012
@@ -37,6 +37,7 @@ import java.io.File;
import java.net.URL;
import java.util.Map;
import java.util.Properties;
+import org.springframework.test.annotation.DirtiesContext;
/**
* JdoRbacManagerTest:
@@ -45,6 +46,7 @@ import java.util.Properties;
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*
*/
+@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
public class JdoRbacManagerTest
extends AbstractRbacManagerTestCase
{
@@ -211,5 +213,6 @@ public class JdoRbacManagerTest
rbacManager.eraseDatabase();
eventTracker.rbacInit( true );
super.testStoreInitialization();
+ assertEquals( EVENTCOUNT, eventTracker.initCount );
}
}
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=1380277&r1=1380276&r2=1380277&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
Mon Sep 3 15:50:50 2012
@@ -25,6 +25,7 @@ import org.junit.Before;
import javax.inject.Inject;
import javax.inject.Named;
+import org.springframework.test.annotation.DirtiesContext;
/**
* MemoryRbacManagerTest
@@ -32,6 +33,7 @@ import javax.inject.Named;
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*
*/
+@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
public class MemoryRbacManagerTest
extends AbstractRbacManagerTestCase
{
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=1380277&r1=1380276&r2=1380277&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
Mon Sep 3 15:50:50 2012
@@ -55,7 +55,7 @@ public abstract class AbstractRbacManage
private RBACDefaults rbacDefaults;
- private static final int EVENTCOUNT = 2;
+ public static int EVENTCOUNT = 2; // set to 2 because most of test start
with eventTracker.rbacInit( true ); => incrementing eventrackercount by one
public void setRbacManager( RBACManager store )
{
this.rbacManager = store;
@@ -153,7 +153,7 @@ public abstract class AbstractRbacManage
/* Assert some event tracker stuff */
assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
+ //assertEquals( 1, eventTracker.initCount ); // test is done in
overrided methods
//assertTrue( eventTracker.lastDbFreshness.booleanValue() );
assertEquals( 1, eventTracker.addedRoleNames.size() );
@@ -480,7 +480,7 @@ public abstract class AbstractRbacManage
/* Assert some event tracker stuff */
assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
+ assertEquals( EVENTCOUNT, eventTracker.initCount );
assertTrue( eventTracker.lastDbFreshness.booleanValue() );
assertEquals( 1, eventTracker.addedRoleNames.size() );
@@ -696,7 +696,7 @@ public abstract class AbstractRbacManage
/* Assert some event tracker stuff */
assertNotNull( eventTracker );
- assertEquals( EVENTCOUNT, eventTracker.initCount );
+ assertEquals( EVENTCOUNT, eventTracker.initCount ); // XXX failing
sometimes with cached
assertTrue( eventTracker.lastDbFreshness.booleanValue() );
assertEquals( 2, eventTracker.addedRoleNames.size() );
@@ -791,6 +791,60 @@ public abstract class AbstractRbacManage
}
@Test
+ public void testAddRemovePermanentRole()
+ throws RbacManagerException
+ {
+ assertNotNull( rbacManager );
+ rbacManager.eraseDatabase();
+ eventTracker.rbacInit( true );
+
+ Role adminRole = getAdminRole();
+ adminRole.setPermanent( true );
+
+ adminRole = rbacManager.saveRole( adminRole );
+ Role develRole = rbacManager.saveRole( getDeveloperRole() );
+
+ assertEquals( 2, rbacManager.getAllRoles().size() );
+
+ Role actualAdmin = rbacManager.getRole( adminRole.getName() );
+ Role actualDevel = rbacManager.getRole( develRole.getName() );
+
+ assertEquals( adminRole, actualAdmin );
+ assertEquals( develRole, actualDevel );
+
+ // Attempt to remove perm now.
+ try
+ {
+ // Use role name technique first.
+ rbacManager.removeRole( adminRole.getName() );
+ }
+ catch ( RbacPermanentException e )
+ {
+ // expected path.
+ }
+
+ try
+ {
+ // Use role object technique next.
+ rbacManager.removeRole( adminRole );
+ }
+ catch ( RbacPermanentException e )
+ {
+ // expected path.
+ }
+
+ /* 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() );
+ }
+
+ @Test
public void testGetRolesDeep()
throws RbacManagerException
{
@@ -807,7 +861,7 @@ public abstract class AbstractRbacManage
assertEquals( 1, rbacManager.getAllUserAssignments().size() );
assertEquals( 4, rbacManager.getAllRoles().size() );
assertEquals( 6, rbacManager.getAllPermissions().size() );
-
+
// Get the List of Assigned Roles for user bob.
Role devel = rbacManager.getRole( "Developer" );
assertNotNull( devel );
@@ -836,8 +890,8 @@ public abstract class AbstractRbacManage
rbacManager.saveUserAssignment( assignment );
assertEquals( 1, rbacManager.getAllUserAssignments().size() );
- assertEquals( 4, rbacManager.getAllRoles().size() );
assertEquals( 6, rbacManager.getAllPermissions().size() );
+ assertEquals( 4, rbacManager.getAllRoles().size() );
afterSetup();
@@ -922,60 +976,6 @@ public abstract class AbstractRbacManage
}
@Test
- public void testAddRemovePermanentRole()
- throws RbacManagerException
- {
- assertNotNull( rbacManager );
- rbacManager.eraseDatabase();
- eventTracker.rbacInit( true );
-
- Role adminRole = getAdminRole();
- adminRole.setPermanent( true );
-
- adminRole = rbacManager.saveRole( adminRole );
- Role develRole = rbacManager.saveRole( getDeveloperRole() );
-
- assertEquals( 2, rbacManager.getAllRoles().size() );
-
- Role actualAdmin = rbacManager.getRole( adminRole.getName() );
- Role actualDevel = rbacManager.getRole( develRole.getName() );
-
- assertEquals( adminRole, actualAdmin );
- assertEquals( develRole, actualDevel );
-
- // Attempt to remove perm now.
- try
- {
- // Use role name technique first.
- rbacManager.removeRole( adminRole.getName() );
- }
- catch ( RbacPermanentException e )
- {
- // expected path.
- }
-
- try
- {
- // Use role object technique next.
- rbacManager.removeRole( adminRole );
- }
- catch ( RbacPermanentException e )
- {
- // expected path.
- }
-
- /* 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() );
- }
-
- @Test
public void testAddRemovePermanentOperation()
throws RbacManagerException
{
