X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fjpatest%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthentication%2Fjpa%2FJpaUserSetTest.java;h=4a9ab5f0e0a9f78663966c40ff7804e366c7545a;hb=cb91054f35281c6fc5619f93ff71df46bf4686b9;hp=f5b5fa10b43c6385ae3d742bbe7ac05b23c03880;hpb=03b34d260efda9f7df9fe35a703acd83c0cfe317;p=utils

diff --git a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java
index f5b5fa10..4a9ab5f0 100644
--- a/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java
+++ b/security/jpatest/src/test/java/org/wamblee/security/authentication/jpa/JpaUserSetTest.java
@@ -24,17 +24,15 @@ import org.wamblee.io.ClassPathResource;
 import org.wamblee.security.authentication.Group;
 import org.wamblee.security.authentication.GroupSet;
 import org.wamblee.security.authentication.InMemoryUserSetTest;
+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.UserSet;
-import org.wamblee.security.authentication.jpa.JpaGroupSet;
-import org.wamblee.security.authentication.jpa.JpaUserSet;
-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.support.persistence.DatabaseUtils.JdbcUnitOfWork;
+import org.wamblee.test.persistence.JpaTester;
+import org.wamblee.test.persistence.TransactionProxyFactory;
+import org.wamblee.test.persistence.DatabaseUtils.JdbcUnitOfWork;
 
 /**
  * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet}
@@ -96,8 +94,8 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
     private GroupSet createGroupSetImpl() {
         TransactionProxyFactory<GroupSet> factory = new TransactionProxyFactory<GroupSet>(
             jpaTester.getJpaBuilder(), GroupSet.class);
-        GroupSet groupset = new JpaGroupSet(factory.getTransactionScopedEntityManager());
-        GroupSet proxy = factory.getProxy(groupset);
+        GroupSet groups = new JpaGroupSet(factory.getTransactionScopedEntityManager());
+        GroupSet proxy = factory.getProxy(groups);
         return proxy;
     }
 
@@ -232,7 +230,7 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
      * 
      */
     public void testVerifyAddRemove() throws Exception {
-        jpaTester.getDbUtils().cleanDatabase(); // super class setup always creates one group. 
+        jpaTester.getDbUtils().cleanDatabase(new SecurityTables()); // super class setup always creates one group. 
         
         GroupSet groups = getGroups();
         assertEquals(0, groups.size());