X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fjpatest%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsecurity%2Fauthentication%2Fjpa%2FJpaUserSetTest.java;h=99b618653256bdc99876d663d50c264c4a53c9e0;hb=7911867f17b475f221d93f106c3f1dfecd0b295e;hp=7c5274ddadba550466454b9352ea8d63f0b68164;hpb=ca6cd90ac2aeca2f61320ac15c2403dde120f3de;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 7c5274dd..99b61865 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
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */ 
+ */
 package org.wamblee.security.authentication.jpa;
 
 import java.sql.Connection;
@@ -56,7 +56,7 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
 
     private EhCache<String, User> userCache;
 
-    private JpaTester jpaTester; 
+    private JpaTester jpaTester;
 
     /*
      * (non-Javadoc)
@@ -68,33 +68,34 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
         jpaTester = new JpaTester(new SecurityPersistenceUnit());
         jpaTester.start();
 
-        userCache = new EhCache<String, User>(
-            new ClassPathResource("properties/org.wamblee.security.ehcache.xml"), "users");
-     
+        userCache = new EhCache<String, User>(new ClassPathResource(
+            "properties/org.wamblee.security.ehcache.xml"), "users");
+
         userset = createUserSetImpl();
         groupset = createGroupSetImpl();
-        
+
         clearUserCache();
 
         super.setUp();
     }
-    
+
     private UserSet createUserSetImpl() {
-        NameValidator passwordValidator = new RegexpNameValidator(
-            ".{5,}", "INVALID_PASSWORD", "Password must have at least 5 characters");
-        
+        NameValidator passwordValidator = new RegexpNameValidator(".{5,}",
+            "INVALID_PASSWORD", "Password must have at least 5 characters");
+
         MessageDigester passwordDigester = new Md5HexMessageDigester();
         TransactionProxyFactory<UserSet> factory = new TransactionProxyFactory<UserSet>(
             jpaTester.getJpaBuilder(), UserSet.class);
-        UserSet jpaUserset = new JpaUserSet(userCache, passwordValidator, passwordDigester,
-            factory.getTransactionScopedEntityManager());
+        UserSet jpaUserset = new JpaUserSet(userCache, passwordValidator,
+            passwordDigester, factory.getTransactionScopedEntityManager());
         return factory.getProxy(jpaUserset);
     }
-    
+
     private GroupSet createGroupSetImpl() {
         TransactionProxyFactory<GroupSet> factory = new TransactionProxyFactory<GroupSet>(
             jpaTester.getJpaBuilder(), GroupSet.class);
-        GroupSet groups = new JpaGroupSet(factory.getTransactionScopedEntityManager());
+        GroupSet groups = new JpaGroupSet(factory
+            .getTransactionScopedEntityManager());
         GroupSet proxy = factory.getProxy(groups);
         return proxy;
     }
@@ -136,13 +137,15 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
     }
 
     private int countUser(final String aUser) throws Exception {
-        int count = jpaTester.getDbUtils().executeInTransaction(new JdbcUnitOfWork<Integer>() {
-            @Override
-            public Integer execute(Connection aConnection) throws Exception {
-                ResultSet res = jpaTester.getDbUtils().executeQuery(aConnection, USER_QUERY, aUser);
-                return jpaTester.getDbUtils().countResultSet(res);
-            }
-        });
+        int count = jpaTester.getDbUtils().executeInTransaction(
+            new JdbcUnitOfWork<Integer>() {
+                @Override
+                public Integer execute(Connection aConnection) throws Exception {
+                    ResultSet res = jpaTester.getDbUtils().executeQuery(
+                        aConnection, USER_QUERY, aUser);
+                    return jpaTester.getDbUtils().countResultSet(res);
+                }
+            });
         return count;
     }
 
@@ -167,15 +170,17 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
     protected void checkGroupCount(int aSize) throws Exception {
         assertEquals(aSize, jpaTester.getDbUtils().getTableSize(GROUP_TABLE));
     }
-    
+
     private int countGroup(final String aGroup) throws Exception {
-        int count = jpaTester.getDbUtils().executeInTransaction(new JdbcUnitOfWork<Integer>() {
-            @Override
-            public Integer execute(Connection aConnection) throws Exception {
-                ResultSet res = jpaTester.getDbUtils().executeQuery(aConnection, GROUP_QUERY, aGroup);
-                return jpaTester.getDbUtils().countResultSet(res);
-            }
-        });
+        int count = jpaTester.getDbUtils().executeInTransaction(
+            new JdbcUnitOfWork<Integer>() {
+                @Override
+                public Integer execute(Connection aConnection) throws Exception {
+                    ResultSet res = jpaTester.getDbUtils().executeQuery(
+                        aConnection, GROUP_QUERY, aGroup);
+                    return jpaTester.getDbUtils().countResultSet(res);
+                }
+            });
         return count;
     }
 
@@ -230,8 +235,14 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
      * 
      */
     public void testVerifyAddRemove() throws Exception {
-        jpaTester.getDbUtils().cleanDatabase(new SecurityTables()); // 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());
 
@@ -249,9 +260,9 @@ public class JpaUserSetTest extends InMemoryUserSetTest {
         addUserToGroup(user, group2);
         getUsers().userModified(user);
         clearUserCache();
-        
+
         User user2 = getUsers().find("user");
-        
+
         Set<Group> userGroups = user2.getGroups();
         assertTrue(user2.isInGroup("group1"));
         assertTrue(user2.isInGroup("group2"));