X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fusermgt%2Fhibernate%2FHibernateUserSetTest.java;h=81106a5a95d91ca248b250222e273eb3bb623ebe;hb=ddd261f331280640c5b53c7128230b629ebcd268;hp=46e80fb3d005afc3c555c6f5d381b663c275e119;hpb=92e23e5ecf9614f2ab770a8cdedc0b21ddf1e127;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..81106a5a 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,69 +29,140 @@ 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 { - + /** + * 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 = ?"; + + " where name = ?"; + + /** + * DOCUMENT ME! + */ private static final String GROUP_QUERY = "select * from " + GROUP_TABLE - + " where name = ?"; + + " 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 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); - config.getSetterConfig().clear().add("setUserset").add( - "setGroupset").add("setDatabaseTester").add("setUserCache"); + + ObjectConfiguration config = new ObjectConfiguration(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(); } + /** + * 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 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); @@ -111,9 +178,16 @@ 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(); @@ -123,33 +197,56 @@ 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! + */ @Override protected void checkUserExists(String aUser) throws SQLException { databaseTester.flush(); + ResultSet result = databaseTester.executeQuery(USER_QUERY, aUser); assertEquals(1, databaseTester.countResultSet(result)); } /* * (non-Javadoc) - * + * * @see org.wamblee.usermgt.InMemoryGroupSetTest#checkGroupNotExists(java.lang.String) */ + /** + * DOCUMENT ME! + * + * @param aUser DOCUMENT ME! + * + * @throws SQLException DOCUMENT ME! + */ @Override protected void checkUserNotExists(String aUser) throws SQLException { databaseTester.flush(); + ResultSet result = databaseTester.executeQuery(USER_QUERY, aUser); assertEquals(0, databaseTester.countResultSet(result)); } /* * (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(); @@ -158,9 +255,16 @@ 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! + */ @Override protected void checkGroupExists(String aGroup) throws SQLException { databaseTester.flush(); @@ -171,21 +275,34 @@ 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! + */ @Override protected void checkGroupNotExists(String aGroup) throws SQLException { databaseTester.flush(); + ResultSet result = databaseTester.executeQuery(GROUP_QUERY, aGroup); assertEquals(0, databaseTester.countResultSet(result)); } /* * (non-Javadoc) - * + * * @see org.wamblee.usermgt.InMemoryGroupSetTest#createGroupSet() */ + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ @Override protected UserSet createUserSet() { return userset; @@ -193,23 +310,33 @@ 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. + * 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! */ 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,7 +351,8 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { addUserToGroup(user, group2); getUsers().userModified(user); clearUserCache(); - User user2 = getUsers().find("user"); + + User user2 = getUsers().find("user"); Set userGroups = user2.getGroups(); assertTrue(user2.isInGroup("group1")); assertTrue(user2.isInGroup("group2")); @@ -233,11 +361,10 @@ 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()); } - }