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=81106a5a95d91ca248b250222e273eb3bb623ebe;hpb=89c06d4d52b46c154128c97d6e758fa1f4fc7a6e;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 81106a5a..6c5e095d 100644
--- a/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
+++ b/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java
@@ -36,82 +36,47 @@ import java.sql.SQLException;
 
 import java.util.Set;
 
-
 /**
  * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet}
- *
+ * 
  * @author Erik Brakkee
  */
 public class HibernateUserSetTest extends InMemoryUserSetTest {
-    /**
-     * DOCUMENT ME!
-     */
     private static final String USER_TABLE = "USERS";
 
-    /**
-     * DOCUMENT ME!
-     */
     private static final String GROUP_TABLE = "GROUPS";
 
-    /**
-     * DOCUMENT ME!
-     */
-    private static final String USER_QUERY = "select * from " + USER_TABLE
-        + " where name = ?";
+    private static final String USER_QUERY = "select * from " + USER_TABLE +
+        " where name = ?";
 
-    /**
-     * DOCUMENT ME!
-     */
-    private static final String GROUP_QUERY = "select * from " + GROUP_TABLE
-        + " where name = ?";
+    private static final String GROUP_QUERY = "select * from " + GROUP_TABLE +
+        " where name = ?";
 
-    /**
-     * DOCUMENT ME!
-     */
     private DefaultContainer container;
 
-    /**
-     * DOCUMENT ME!
-     */
     private Scope scope;
 
-    /**
-     * DOCUMENT ME!
-     */
     private UserSet userset;
 
-    /**
-     * DOCUMENT ME!
-     */
     private GroupSet groupset;
 
-    /**
-     * DOCUMENT ME!
-     */
     private EhCache<Serializable, Serializable> userCache;
 
-    /**
-     * DOCUMENT ME!
-     */
     private DatabaseTesterComponent databaseTester;
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.usermgt.InMemoryUserSetTest#setUp()
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @throws Exception DOCUMENT ME!
-     */
     @Override
     protected void setUp() throws Exception {
         container = new UserMgtRepositoryTestContainer("top");
 
-        ObjectConfiguration config = new ObjectConfiguration(HibernateUserSetTest.class);
+        ObjectConfiguration config = new ObjectConfiguration(
+            HibernateUserSetTest.class);
         config.getSetterConfig().clear().add("setUserset").add("setGroupset")
-        .add("setDatabaseTester").add("setUserCache");
+            .add("setDatabaseTester").add("setUserCache");
         container.addComponent("testcase", this, config);
 
         scope = container.start();
@@ -122,47 +87,22 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
         super.setUp();
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aUserset DOCUMENT ME!
-     */
     public void setUserset(UserSet aUserset) {
         userset = aUserset;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aGroupset DOCUMENT ME!
-     */
     public void setGroupset(GroupSet aGroupset) {
         groupset = aGroupset;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aUserCache DOCUMENT ME!
-     */
     public void setUserCache(EhCache<Serializable, Serializable> aUserCache) {
         userCache = aUserCache;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aDatabaseTester DOCUMENT ME!
-     */
     public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) {
         databaseTester = aDatabaseTester;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @throws Exception DOCUMENT ME!
-     */
     @Override
     protected void tearDown() throws Exception {
         container.stop(scope);
@@ -178,16 +118,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupCount(int)
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aSize DOCUMENT ME!
-     *
-     * @throws SQLException DOCUMENT ME!
-     */
     @Override
     protected void checkUserCount(int aSize) throws SQLException {
         databaseTester.flush();
@@ -197,15 +130,10 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String)
-     */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aUser DOCUMENT ME!
-     *
-     * @throws SQLException DOCUMENT ME!
+     * 
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String
+     * )
      */
     @Override
     protected void checkUserExists(String aUser) throws SQLException {
@@ -217,15 +145,10 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang.String)
-     */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aUser DOCUMENT ME!
-     *
-     * @throws SQLException DOCUMENT ME!
+     * 
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang
+     * .String)
      */
     @Override
     protected void checkUserNotExists(String aUser) throws SQLException {
@@ -237,16 +160,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupCount(int)
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aSize DOCUMENT ME!
-     *
-     * @throws SQLException DOCUMENT ME!
-     */
     @Override
     protected void checkGroupCount(int aSize) throws SQLException {
         databaseTester.flush();
@@ -255,15 +171,10 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String)
-     */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aGroup DOCUMENT ME!
-     *
-     * @throws SQLException DOCUMENT ME!
+     * 
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupExists(java.lang.String
+     * )
      */
     @Override
     protected void checkGroupExists(String aGroup) throws SQLException {
@@ -275,15 +186,10 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
-     * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang.String)
-     */
-    /**
-     * DOCUMENT ME!
-     *
-     * @param aGroup DOCUMENT ME!
-     *
-     * @throws SQLException DOCUMENT ME!
+     * 
+     * @see
+     * org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang
+     * .String)
      */
     @Override
     protected void checkGroupNotExists(String aGroup) throws SQLException {
@@ -295,14 +201,9 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.usermgt.InMemoryGroupSetTest#createGroupSet()
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     @Override
     protected UserSet createUserSet() {
         return userset;
@@ -310,26 +211,19 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see org.wamblee.usermgt.InMemoryUserSetTest#createGroupSet()
      */
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
     @Override
     protected GroupSet createGroupSet() {
         return groupset;
     }
 
     /**
-     * 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.
-     *
-     * @throws SQLException DOCUMENT ME!
-     * @throws UserMgtException DOCUMENT ME!
+     * 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.
@@ -352,7 +246,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
         getUsers().userModified(user);
         clearUserCache();
 
-        User       user2      = getUsers().find("user");
+        User user2 = getUsers().find("user");
         Set<Group> userGroups = user2.getGroups();
         assertTrue(user2.isInGroup("group1"));
         assertTrue(user2.isInGroup("group2"));
@@ -361,8 +255,8 @@ public class HibernateUserSetTest extends InMemoryUserSetTest {
         removeUserFromGroup(user, group1);
         getUsers().userModified(user);
         clearUserCache();
-        user2          = getUsers().find("user");
-        userGroups     = user2.getGroups();
+        user2 = getUsers().find("user");
+        userGroups = user2.getGroups();
         assertFalse(user2.isInGroup("group1"));
         assertTrue(user2.isInGroup("group2"));
         assertEquals(1, userGroups.size());