X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fjpatest%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthentication%2Fjpa%2FUserAdministrationTester.java;h=a1bc3f7835b308885c8d20cae2ab5e942ff5ef94;hb=f9ccadb956bac942258d9892c66e481ac2aec446;hp=634e10ed5ddd39f09329a9e619c450b136a7c088;hpb=a0e5219a62cafc60127bcbb9ea2b7c3f8c403ccb;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 634e10ed..a1bc3f78 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,14 +19,14 @@ 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.PersistenceUnitDescription; import org.wamblee.support.persistence.TransactionProxyFactory; @@ -43,6 +43,7 @@ public class UserAdministrationTester { private JpaTester jpaTester; private Cache userCache; private UserAdministration userAdmin; + private MessageDigester passwordDigester; public UserAdministrationTester() { persistenceUnit = new SecurityPersistenceUnit(); @@ -60,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 @@ -90,6 +91,10 @@ public class UserAdministrationTester { public UserAdministration getUserAdministration() { return userAdmin; } + + public MessageDigester getPasswordEncoder() { + return passwordDigester; + } public void stop() throws Exception { jpaTester.stop();