X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fjpatest%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthentication%2Fjpa%2FUserAdministrationTester.java;h=e11c97cf67cffe771c018b1f0b32617a574bafea;hb=c352d5f80485dd4d4edca02abec7144a0856b940;hp=366ec6a981e134165eb0afada69a829c6ca65e90;hpb=0788052b0c089361d8e00724028356c4fa6f28e8;p=utils

diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java
index 366ec6a9..e11c97cf 100644
--- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/UserAdministrationTester.java
@@ -19,16 +19,17 @@ import org.wamblee.cache.Cache;
 import org.wamblee.cache.EhCache;
 import org.wamblee.io.ClassPathResource;
 import org.wamblee.security.authentication.GroupSet;
+import org.wamblee.security.authentication.Md5HexMessageDigester;
+import org.wamblee.security.authentication.MessageDigester;
 import org.wamblee.security.authentication.NameValidator;
 import org.wamblee.security.authentication.RegexpNameValidator;
 import org.wamblee.security.authentication.User;
 import org.wamblee.security.authentication.UserAdministration;
 import org.wamblee.security.authentication.UserAdministrationImpl;
 import org.wamblee.security.authentication.UserSet;
-import org.wamblee.security.encryption.Md5HexMessageDigester;
-import org.wamblee.security.encryption.MessageDigester;
-import org.wamblee.support.persistence.JpaTester;
-import org.wamblee.support.persistence.TransactionProxyFactory;
+import org.wamblee.test.persistence.JpaTester;
+import org.wamblee.test.persistence.PersistenceUnitDescription;
+import org.wamblee.test.transactions.TransactionProxyFactory;
 
 /**
  * Setup of a security repository for unit test. This provides all the necessary wiring
@@ -38,12 +39,15 @@ import org.wamblee.support.persistence.TransactionProxyFactory;
  */
 public class UserAdministrationTester {
 
+    private PersistenceUnitDescription persistenceUnit; 
     private JpaTester jpaTester;
     private Cache<String, User> userCache;
     private UserAdministration userAdmin; 
+    private MessageDigester passwordDigester;
 
     public UserAdministrationTester() {
-        jpaTester = new JpaTester(new SecurityPersistenceUnit());
+        persistenceUnit = new SecurityPersistenceUnit(); 
+        jpaTester = new JpaTester(persistenceUnit);
     }
 
     public void start() throws Exception {
@@ -57,7 +61,7 @@ public class UserAdministrationTester {
 
         NameValidator passwordValidator = new RegexpNameValidator(".{5,}",
             "INVALID_PASSWORD", "Password must have at least 5 characters");
-        MessageDigester passwordDigester = new Md5HexMessageDigester();
+        passwordDigester = new Md5HexMessageDigester();
         UserSet userset = new JpaUserSet(userCache, passwordValidator,
             passwordDigester, factory.getTransactionScopedEntityManager());
         GroupSet groupset = new JpaGroupSet(factory
@@ -72,6 +76,9 @@ public class UserAdministrationTester {
         userAdmin = factory.getProxy(userAdminImpl);
     }
    
+    public PersistenceUnitDescription getPersistenceUnit() {
+        return persistenceUnit;
+    }
     
     public JpaTester getJpaTester() {
         return jpaTester;
@@ -84,6 +91,10 @@ public class UserAdministrationTester {
     public UserAdministration getUserAdministration() {
         return userAdmin;
     }
+    
+    public MessageDigester getPasswordEncoder() { 
+        return passwordDigester;
+    }
 
     public void stop() throws Exception {
         jpaTester.stop();