X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fjpatest%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthentication%2Fjpa%2FUserAdministrationTester.java;h=c90afc8e94741afc89a65243f215087119590717;hb=7911867f17b475f221d93f106c3f1dfecd0b295e;hp=a1bc3f7835b308885c8d20cae2ab5e942ff5ef94;hpb=c57f48be7eb404ec3cc72d4586eff1ea32c3b673;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 a1bc3f78..c90afc8e 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 @@ -27,34 +27,33 @@ 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.support.persistence.JpaTester; -import org.wamblee.support.persistence.PersistenceUnitDescription; -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 - * and JPA setup. + * Setup of a security repository for unit test. This provides all the necessary + * wiring and JPA setup. * * @author Erik Brakkee */ public class UserAdministrationTester { - private PersistenceUnitDescription persistenceUnit; + private PersistenceUnitDescription persistenceUnit; private JpaTester jpaTester; private Cache userCache; - private UserAdministration userAdmin; + private UserAdministration userAdmin; private MessageDigester passwordDigester; public UserAdministrationTester() { - persistenceUnit = new SecurityPersistenceUnit(); + persistenceUnit = new SecurityPersistenceUnit(); jpaTester = new JpaTester(persistenceUnit); } public void start() throws Exception { jpaTester.start(); - userCache = new EhCache( - new ClassPathResource("properties/org.wamblee.security.ehcache.xml"), - "users"); + userCache = new EhCache(new ClassPathResource( + "properties/org.wamblee.security.ehcache.xml"), "users"); TransactionProxyFactory factory = new TransactionProxyFactory( jpaTester.getJpaBuilder(), UserAdministration.class); @@ -75,15 +74,15 @@ public class UserAdministrationTester { groupset, userValidator, groupValidator); userAdmin = factory.getProxy(userAdminImpl); } - + public PersistenceUnitDescription getPersistenceUnit() { return persistenceUnit; } - + public JpaTester getJpaTester() { return jpaTester; } - + public Cache getUserCache() { return userCache; } @@ -91,8 +90,8 @@ public class UserAdministrationTester { public UserAdministration getUserAdministration() { return userAdmin; } - - public MessageDigester getPasswordEncoder() { + + public MessageDigester getPasswordEncoder() { return passwordDigester; }