(no commit message)

[utils] / security / jpatest / src / test / java / org / wamblee / security / authentication / jpa / JpaUserAdministrationTest.java

diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
index 2e95c823f096ad17e2116c3d01a42d5924c1d0d9..8eaa8becfe14909f48c75307b64c63cb7c1ee55d 100644 (file)
--- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserAdministrationTest.java
@@ -51,11 +51,7 @@ public class JpaUserAdministrationTest extends UserAdministrationImplTest {
     private static final Log LOG = LogFactory
         .getLog(JpaUserAdministrationTest.class);
 
-    private JpaTester jpaTester;
-
-    private EhCache<String, User> userCache;
-
-    private UserAdministration userAdmin;
+    private UserAdministrationTester userAdminTester; 
 
     /*
      * (non-Javadoc)
@@ -64,38 +60,15 @@ public class JpaUserAdministrationTest extends UserAdministrationImplTest {
      */
     @Override
     protected void setUp() throws Exception {
-        jpaTester = new JpaTester(new SecurityPersistenceUnit());
-        jpaTester.start();
-
-        userCache = new EhCache<String, User>(new ClassPathResource(
-            "properties/org.wamblee.security.ehcache.xml"), "users");
-
-        TransactionProxyFactory<UserAdministration> factory = new TransactionProxyFactory<UserAdministration>(
-            jpaTester.getJpaBuilder(), UserAdministration.class);
-
-        NameValidator passwordValidator = new RegexpNameValidator(".{5,}",
-            "INVALID_PASSWORD", "Password must have at least 5 characters");
-        MessageDigester passwordDigester = new Md5HexMessageDigester();
-        UserSet userset = new JpaUserSet(userCache, passwordValidator,
-            passwordDigester, factory.getTransactionScopedEntityManager());
-        GroupSet groupset = new JpaGroupSet(factory
-            .getTransactionScopedEntityManager());
-
-        NameValidator userValidator = new RegexpNameValidator(
-            "[a-zA-Z]+[a-zA-Z0-9]*", "INVALID_USERNAME", "");
-        NameValidator groupValidator = new RegexpNameValidator(
-            "[a-zA-Z]+[a-zA-Z0-9]*", "INVALID_GROUPNAME", "");
-        UserAdministration userAdminImpl = new UserAdministrationImpl(userset,
-            groupset, userValidator, groupValidator);
-        userAdmin = factory.getProxy(userAdminImpl);
-
+        userAdminTester = new UserAdministrationTester(); 
+        userAdminTester.start();
         super.setUp();
         clearUserCache();
     }
 
     @Override
     protected void tearDown() throws Exception {
-        jpaTester.stop();
+        userAdminTester.stop();
         super.tearDown();
     }
 
@@ -106,7 +79,7 @@ public class JpaUserAdministrationTest extends UserAdministrationImplTest {
      */
     @Override
     protected UserAdministration createAdmin() {
-        return userAdmin;
+        return userAdminTester.getUserAdministration();
     }
     
     public void testAllTestsInASeparateTransaction() throws Exception {
@@ -114,9 +87,9 @@ public class JpaUserAdministrationTest extends UserAdministrationImplTest {
 
         for (final Method method : methods) {
             if (method.getName().startsWith("test")) {
-                jpaTester.getDbUtils().cleanDatabase();
+                userAdminTester.getJpaTester().getDbUtils().cleanDatabase();
                 clearUserCache();
-                jpaTester.getDbUtils().executeInTransaction(
+                userAdminTester.getJpaTester().getDbUtils().executeInTransaction(
                     new JdbcUnitOfWork<Void>() {
                         @Override
                         public Void execute(Connection aConnection)
@@ -141,6 +114,6 @@ public class JpaUserAdministrationTest extends UserAdministrationImplTest {
     }
 
     private void clearUserCache() {
-        userCache.clear();
+        userAdminTester.getUserCache().clear();
     }
 }