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=3d6f8c54d99a52f74db6ec84f1a9d31b21d68fa2;hpb=884550fe9a315a5d17bcafcaebbe9a22452bd0c2;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 3d6f8c54..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,42 +1,40 @@ /* * 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 javax.sql.DataSource; - -import org.wamblee.cache.Cache; import org.wamblee.cache.EhCache; -import org.wamblee.general.BeanKernel; + import org.wamblee.system.adapters.DefaultContainer; import org.wamblee.system.adapters.ObjectConfiguration; import org.wamblee.system.core.Scope; -import org.wamblee.system.spring.DatabaseTesterComponent; +import org.wamblee.system.spring.component.DatabaseTesterComponent; + import org.wamblee.usermgt.Group; import org.wamblee.usermgt.GroupSet; import org.wamblee.usermgt.InMemoryUserSetTest; import org.wamblee.usermgt.User; import org.wamblee.usermgt.UserMgtException; import org.wamblee.usermgt.UserSet; -import org.wamblee.usermgt.UsermgtSpringConfigFiles; + +import java.io.Serializable; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import java.util.Set; /** * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet} @@ -44,22 +42,27 @@ import org.wamblee.usermgt.UsermgtSpringConfigFiles; * @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 userCache; - private DefaultContainer _container; - private Scope _scope; - - private UserSet _userset; - private GroupSet _groupset; - private EhCache _userCache; - private DatabaseTesterComponent _databaseTester; + private DatabaseTesterComponent databaseTester; /* * (non-Javadoc) @@ -68,42 +71,41 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { */ @Override protected void setUp() throws Exception { + container = new UserMgtRepositoryTestContainer("top"); - _container = new UserMgtRepositoryTestContainer("top"); - ObjectConfiguration config = new ObjectConfiguration( - HibernateUserSetTest.class); - config.getSetterConfig().clear().add("userset").add( - "groupset").add("databaseTester").add("userCache"); - _container.addComponent("testcase", this, config); + HibernateUserSetTest.class); + config.getSetterConfig().clear().add("setUserset").add("setGroupset") + .add("setDatabaseTester").add("setUserCache"); + container.addComponent("testcase", this, config); - _scope = _container.start(); + scope = container.start(); clearUserCache(); - _databaseTester.cleanDatabase(); - + databaseTester.cleanDatabase(); + super.setUp(); } public void setUserset(UserSet aUserset) { - _userset = aUserset; + userset = aUserset; } public void setGroupset(GroupSet aGroupset) { - _groupset = aGroupset; + groupset = aGroupset; } public void setUserCache(EhCache aUserCache) { - _userCache = aUserCache; + userCache = aUserCache; } public void setDatabaseTester(DatabaseTesterComponent aDatabaseTester) { - _databaseTester = aDatabaseTester; + databaseTester = aDatabaseTester; } @Override protected void tearDown() throws Exception { - _container.stop(_scope); + container.stop(scope); super.tearDown(); } @@ -111,7 +113,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { * Clears the user cache. */ private void clearUserCache() { - _userCache.clear(); + userCache.clear(); } /* @@ -121,33 +123,39 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { */ @Override protected void checkUserCount(int aSize) throws SQLException { - _databaseTester.flush(); + databaseTester.flush(); super.checkUserCount(aSize); - assertEquals(aSize, _databaseTester.getTableSize(USER_TABLE)); + assertEquals(aSize, databaseTester.getTableSize(USER_TABLE)); } /* * (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)); + 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) + * @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)); + databaseTester.flush(); + + ResultSet result = databaseTester.executeQuery(USER_QUERY, aUser); + assertEquals(0, databaseTester.countResultSet(result)); } /* @@ -157,33 +165,38 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { */ @Override protected void checkGroupCount(int aSize) throws SQLException { - _databaseTester.flush(); - assertEquals(aSize, _databaseTester.getTableSize(GROUP_TABLE)); + databaseTester.flush(); + assertEquals(aSize, databaseTester.getTableSize(GROUP_TABLE)); } /* * (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 { - _databaseTester.flush(); + databaseTester.flush(); - ResultSet result = _databaseTester.executeQuery(GROUP_QUERY, aGroup); - assertEquals(1, _databaseTester.countResultSet(result)); + ResultSet result = databaseTester.executeQuery(GROUP_QUERY, aGroup); + assertEquals(1, databaseTester.countResultSet(result)); } /* * (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)); + databaseTester.flush(); + + ResultSet result = databaseTester.executeQuery(GROUP_QUERY, aGroup); + assertEquals(0, databaseTester.countResultSet(result)); } /* @@ -193,7 +206,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { */ @Override protected UserSet createUserSet() { - return _userset; + return userset; } /* @@ -203,18 +216,21 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { */ @Override protected GroupSet createGroupSet() { - return _groupset; + 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. + * */ public void testVerifyAddRemove() throws SQLException, UserMgtException { - _databaseTester.cleanDatabase(); // just to be sure. + databaseTester.cleanDatabase(); // just to be sure. + GroupSet groups = getGroups(); assertEquals(0, groups.size()); + Group group1 = createGroup("group1"); Group group2 = createGroup("group2"); groups.add(group1); @@ -229,6 +245,7 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { addUserToGroup(user, group2); getUsers().userModified(user); clearUserCache(); + User user2 = getUsers().find("user"); Set userGroups = user2.getGroups(); assertTrue(user2.isInGroup("group1")); @@ -244,5 +261,4 @@ public class HibernateUserSetTest extends InMemoryUserSetTest { assertTrue(user2.isInGroup("group2")); assertEquals(1, userGroups.size()); } - }