fix for MRM-1656

reback: users provider tests seems to be jdk 7 compatible now

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1379979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
skygo 2012-09-02 14:32:36 +00:00
parent ce750a4972
commit 30e6e5afa6

View File

@ -33,6 +33,7 @@
import javax.inject.Inject;
import java.util.List;
import org.springframework.test.annotation.DirtiesContext;
/**
* AbstractUserManagerTestCase
@ -42,6 +43,7 @@
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath*:/spring-context.xml"} )
@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
public class AbstractUserManagerTestCase
extends TestCase
{
@ -57,6 +59,13 @@ public class AbstractUserManagerTestCase
private UserManagerEventTracker eventTracker;
private static final int EVENTTRACKERCOUNT = 2;
// assertCleanUserManager
// getEventTracker().userManagerInit( true ); is 1
// userManager.getUsers() is 2
// only on clear context
public UserManager getUserManager()
{
return userManager;
@ -167,7 +176,7 @@ public void testAddFindUserByPrincipal()
assertEquals( added, actual );
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -202,7 +211,7 @@ public void testAddFindUserLockedStatus() throws UserNotFoundException {
assertTrue( actual.isLocked() );
/* Check into the event tracker. */
assertEquals(1, getEventTracker().countInit);
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit);
assertNotNull(getEventTracker().lastDbFreshness);
assertTrue(getEventTracker().lastDbFreshness.booleanValue());
@ -228,7 +237,7 @@ public void testAddFindUserByUsername()
assertEquals( added, actual );
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -252,7 +261,7 @@ public void testCreateUser()
assertEquals( 1, um.getUsers().size() );
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -280,7 +289,7 @@ public void testAddUser()
assertEquals( 1, um.getUsers().size() );
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -318,7 +327,7 @@ public void testDeleteUser()
}
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -374,7 +383,7 @@ public void testFindUser()
}
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -508,7 +517,7 @@ public void testUserExists()
assertFalse( um.userExists( "voodoohatrack" ) );
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -550,7 +559,7 @@ public void testUpdateUser()
assertTrue( securityPolicy.getPasswordEncoder().isPasswordValid( user.getEncodedPassword(), "superpass" ) );
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );
@ -592,7 +601,7 @@ public void testDeletePermanentUser()
assertEquals( user.getFullName(), admin.getFullName() );
/* Check into the event tracker. */
assertEquals( 1, getEventTracker().countInit );
assertEquals( EVENTTRACKERCOUNT, getEventTracker().countInit );
assertNotNull( getEventTracker().lastDbFreshness );
assertTrue( getEventTracker().lastDbFreshness.booleanValue() );