From 00ea8074e35c5c799ff432b12cd92ab56a64b8ce Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 14 May 2008 19:23:42 +0000 Subject: [PATCH] Removed SpringTestCase and SpringConfigFiles and subclasses. --- .../AuthorizationServiceTest.java | 3 -- .../AuthorizationSpringConfigFiles.java | 34 --------------- .../wamblee/usermgt/InMemoryGroupSetTest.java | 4 -- .../wamblee/usermgt/InMemoryUserSetTest.java | 3 -- .../usermgt/UserAdministrationImplTest.java | 3 -- .../usermgt/UsermgtSpringConfigFiles.java | 42 ------------------- .../HibernateUserAdministrationTest.java | 3 -- .../hibernate/HibernateUserSetTest.java | 5 --- 8 files changed, 97 deletions(-) delete mode 100644 trunk/security/src/test/java/org/wamblee/security/authorization/hibernate/AuthorizationSpringConfigFiles.java delete mode 100644 trunk/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java b/trunk/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java index 502000e6..151dbd7e 100644 --- a/trunk/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java +++ b/trunk/security/src/test/java/org/wamblee/security/authorization/AuthorizationServiceTest.java @@ -20,9 +20,6 @@ import static org.wamblee.security.authorization.AuthorizationResult.DENIED; import static org.wamblee.security.authorization.AuthorizationResult.GRANTED; import junit.framework.TestCase; -import org.wamblee.persistence.hibernate.HibernateMappingFiles; -import org.wamblee.test.spring.SpringTestCase; -import org.wamblee.test.spring.SpringConfigFiles; import org.wamblee.usermgt.UserAccessor; /** diff --git a/trunk/security/src/test/java/org/wamblee/security/authorization/hibernate/AuthorizationSpringConfigFiles.java b/trunk/security/src/test/java/org/wamblee/security/authorization/hibernate/AuthorizationSpringConfigFiles.java deleted file mode 100644 index 5026cfd9..00000000 --- a/trunk/security/src/test/java/org/wamblee/security/authorization/hibernate/AuthorizationSpringConfigFiles.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.security.authorization.hibernate; - -import org.wamblee.usermgt.UsermgtSpringConfigFiles; - -/** - * - * - * @author Erik Brakkee - */ -public class AuthorizationSpringConfigFiles extends UsermgtSpringConfigFiles { - - public AuthorizationSpringConfigFiles() { - super(new String[] { - "spring/test.org.wamblee.security.useraccessor.xml", - "spring/test.org.wamblee.security.authorization.xml" }); - } - -} diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java b/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java index 3fe6c5a8..2ea11905 100644 --- a/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java +++ b/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryGroupSetTest.java @@ -21,10 +21,6 @@ import java.util.Set; import junit.framework.TestCase; -import org.wamblee.persistence.hibernate.HibernateMappingFiles; -import org.wamblee.test.spring.SpringTestCase; -import org.wamblee.test.spring.SpringConfigFiles; - /** * Tests the inmemory group set. Intended to be subclassed for other * implementations of group set. diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java b/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java index e41a318c..8d60d433 100644 --- a/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java +++ b/trunk/security/src/test/java/org/wamblee/usermgt/InMemoryUserSetTest.java @@ -21,10 +21,7 @@ import java.util.Set; import junit.framework.TestCase; -import org.wamblee.persistence.hibernate.HibernateMappingFiles; import org.wamblee.security.encryption.Md5HexMessageDigester; -import org.wamblee.test.spring.SpringTestCase; -import org.wamblee.test.spring.SpringConfigFiles; import org.wamblee.usermgt.UserMgtException.Reason; /** diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java b/trunk/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java index 4ca03fb6..055828d6 100644 --- a/trunk/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java +++ b/trunk/security/src/test/java/org/wamblee/usermgt/UserAdministrationImplTest.java @@ -21,10 +21,7 @@ import java.util.Set; import junit.framework.TestCase; import org.apache.log4j.Logger; -import org.wamblee.persistence.hibernate.HibernateMappingFiles; import org.wamblee.security.encryption.Md5HexMessageDigester; -import org.wamblee.test.spring.SpringConfigFiles; -import org.wamblee.test.spring.SpringTestCase; import org.wamblee.usermgt.UserMgtException.Reason; /** diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java b/trunk/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java deleted file mode 100644 index c07a5b7c..00000000 --- a/trunk/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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; - -import java.util.Collections; - -import org.wamblee.test.spring.SpringConfigFiles; - -/** - * Spring config files for user management. - * - * @author Erik Brakkee - */ -public class UsermgtSpringConfigFiles extends SpringConfigFiles { - - public UsermgtSpringConfigFiles() { - super(new String[] { "spring/test.org.wamblee.security.properties.xml", - "spring/test.org.wamblee.security.datasource.xml", - "spring/test.org.wamblee.security.database.xml", - "spring/test.org.wamblee.security.usermgt-repositories.xml", - "spring/test.org.wamblee.security.usermgt.xml" }); - } - - public UsermgtSpringConfigFiles(String[] aFiles) { - this(); - Collections.addAll(this, aFiles); - } -} diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java b/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java index 6480e77f..90a5cc9c 100644 --- a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java +++ b/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserAdministrationTest.java @@ -22,9 +22,7 @@ import java.sql.SQLException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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; @@ -32,7 +30,6 @@ import org.wamblee.system.spring.DatabaseTesterComponent; import org.wamblee.test.spring.TestTransactionCallbackWithoutResult; import org.wamblee.usermgt.UserAdministration; import org.wamblee.usermgt.UserAdministrationImplTest; -import org.wamblee.usermgt.UsermgtSpringConfigFiles; /** * User administration tests with persistence based on Hibernate. This executes diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java b/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java index 3d6f8c54..119b5fcd 100644 --- a/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java +++ b/trunk/security/src/test/java/org/wamblee/usermgt/hibernate/HibernateUserSetTest.java @@ -21,11 +21,7 @@ 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; @@ -36,7 +32,6 @@ 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; /** * Tests for {@link org.wamblee.usermgt.hibernate.HibernateGroupSet} -- 2.31.1