X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateUserSetTest.java;h=6c5e095d4b33951cdeee14dfe24b233fb99f3273;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=46e80fb3d005afc3c555c6f5d381b663c275e119;hpb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;p=utils

diff --git a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
index 46e80fb3..6c5e095d 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
@@ -1,31 +1,27 @@
 /*
  * Copyright 2005 the original author or authors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.usermgt.hibernate;
 
-import java.io.Serializable;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Set;
-
 import org.wamblee.cache.EhCache;
+
 import org.wamblee.system.adapters.DefaultContainer;
 import org.wamblee.system.adapters.ObjectConfiguration;
 import org.wamblee.system.core.Scope;
 import org.wamblee.system.spring.component.DatabaseTesterComponent;
+
 import org.wamblee.usermgt.Group;
 import org.wamblee.usermgt.GroupSet;
 import org.wamblee.usermgt.InMemoryUserSetTest;
@@ -33,27 +29,39 @@ import org.wamblee.usermgt.User;
 import org.wamblee.usermgt.UserMgtException;
 import org.wamblee.usermgt.UserSet;
 
+import java.io.Serializable;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import java.util.Set;
+
 /**
  * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet}
  * 
  * @author Erik Brakkee
  */
 public class HibernateUserSetTest extends InMemoryUserSetTest {
-
     private static final String USER_TABLE = "USERS";
+
     private static final String GROUP_TABLE = "GROUPS";
 
-    private static final String USER_QUERY = "select * from " + USER_TABLE
-            + " where name = ?";
-    private static final String GROUP_QUERY = "select * from " + GROUP_TABLE
-            + " where name = ?";
+    private static final String USER_QUERY = "select * from " + USER_TABLE +
+        " where name = ?";
+
+    private static final String GROUP_QUERY = "select * from " + GROUP_TABLE +
+        " where name = ?";
 
     private DefaultContainer container;
+
     private Scope scope;
-    
+
     private UserSet userset;
+
     private GroupSet groupset;
+
     private EhCache<Serializable, Serializable> userCache;
+
     private DatabaseTesterComponent databaseTester;
 
     /*
@@ -63,20 +71,19 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      */
     @Override
     protected void setUp() throws Exception {
-
         container = new UserMgtRepositoryTestContainer("top");
-       
+
         ObjectConfiguration config = new ObjectConfiguration(
-                HibernateUserSetTest.class);
-        config.getSetterConfig().clear().add("setUserset").add(
-                "setGroupset").add("setDatabaseTester").add("setUserCache");
+            HibernateUserSetTest.class);
+        config.getSetterConfig().clear().add("setUserset").add("setGroupset")
+            .add("setDatabaseTester").add("setUserCache");
         container.addComponent("testcase", this, config);
 
         scope = container.start();
 
         clearUserCache();
         databaseTester.cleanDatabase();
-        
+
         super.setUp();
     }
 
@@ -124,11 +131,14 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     /*
      * (non-Javadoc)
      * 
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String)
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String
+     * )
      */
     @Override
     protected void checkUserExists(String aUser) throws SQLException {
         databaseTester.flush();
+
         ResultSet result = databaseTester.executeQuery(USER_QUERY, aUser);
         assertEquals(1, databaseTester.countResultSet(result));
     }
@@ -136,11 +146,14 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     /*
      * (non-Javadoc)
      * 
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang.String)
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang
+     * .String)
      */
     @Override
     protected void checkUserNotExists(String aUser) throws SQLException {
         databaseTester.flush();
+
         ResultSet result = databaseTester.executeQuery(USER_QUERY, aUser);
         assertEquals(0, databaseTester.countResultSet(result));
     }
@@ -159,7 +172,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     /*
      * (non-Javadoc)
      * 
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String)
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String
+     * )
      */
     @Override
     protected void checkGroupExists(String aGroup) throws SQLException {
@@ -172,11 +187,14 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
     /*
      * (non-Javadoc)
      * 
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang.String)
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang
+     * .String)
      */
     @Override
     protected void checkGroupNotExists(String aGroup) throws SQLException {
         databaseTester.flush();
+
         ResultSet result = databaseTester.executeQuery(GROUP_QUERY, aGroup);
         assertEquals(0, databaseTester.countResultSet(result));
     }
@@ -205,11 +223,14 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
      * Reproduction of a bug. Create a user which is in group1 Add it to a
      * second group group2. Remove the user from group1. Verify the user is in
      * group2.
+     * 
      */
     public void testVerifyAddRemove() throws SQLException, UserMgtException {
         databaseTester.cleanDatabase(); // just to be sure.
+
         GroupSet groups = getGroups();
         assertEquals(0, groups.size());
+
         Group group1 = createGroup("group1");
         Group group2 = createGroup("group2");
         groups.add(group1);
@@ -224,6 +245,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
         addUserToGroup(user, group2);
         getUsers().userModified(user);
         clearUserCache();
+
         User user2 = getUsers().find("user");
         Set<Group> userGroups = user2.getGroups();
         assertTrue(user2.isInGroup("group1"));
@@ -239,5 +261,4 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
         assertTrue(user2.isInGroup("group2"));
         assertEquals(1, userGroups.size());
     }
-
 }