Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils: [620] trunk/openutils-usermanagement
|
From: <fc...@us...> - 2008-02-19 10:22:34
|
Revision: 620
http://openutils.svn.sourceforge.net/openutils/?rev=620&view=rev
Author: fcarone
Date: 2008-02-19 02:22:39 -0800 (Tue, 19 Feb 2008)
Log Message:
-----------
UserManagerTest moved to new tests convention
Modified Paths:
--------------
trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java
trunk/openutils-usermanagement/src/test/resources/spring-dao.xml
trunk/openutils-usermanagement/src/test/resources/spring-database.xml
trunk/openutils-usermanagement/src/test/resources/spring-hibernate.xml
trunk/openutils-usermanagement/src/test/resources/spring-managers.xml
trunk/openutils-usermanagement/src/test/resources/spring-tests.xml
Property Changed:
----------------
trunk/openutils-usermanagement/
Property changes on: trunk/openutils-usermanagement
___________________________________________________________________
Name: svn:ignore
- target
.classpath
.project
.settings
db
*.log
.checkstyle
+ target
.classpath
.project
.settings
db
*.log
.checkstyle
test-output
Modified: trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java
===================================================================
--- trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java 2008-02-17 09:11:48 UTC (rev 619)
+++ trunk/openutils-usermanagement/src/test/java/it/openutils/usermanagement/manager/UserManagerTest.java 2008-02-19 10:22:39 UTC (rev 620)
@@ -1,32 +1,62 @@
package it.openutils.usermanagement.manager;
-import it.openutils.testing.junit.GenericsDbUnitTestCase;
+import it.openutils.testing.DbUnitExecution;
+import it.openutils.testing.junit.AbstractDbUnitJunitSpringContextTests;
+import org.dbunit.operation.InsertOperation;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
+import org.springframework.test.context.transaction.TransactionConfiguration;
+import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
+import org.springframework.transaction.annotation.Transactional;
+
/**
* @author fgiust
* @version $Id$
*/
-public class UserManagerTest extends GenericsDbUnitTestCase<UserManager>
+@ContextConfiguration(locations = {"/spring-tests.xml" })
+@DbUnitExecution(datasets = {"/UserManagerTest-load.xml" }, dataSource = "dataSource", //
+ insertOperation = InsertOperation.class)
+@TestExecutionListeners({TransactionalTestExecutionListener.class })
+@Transactional
+@TransactionConfiguration(transactionManager = "transactionManager")
+public class UserManagerTest extends AbstractDbUnitJunitSpringContextTests
{
+ @Autowired
+ private UserManager instance;
+
/**
* test for changePassword()
*/
+ @Test
public void testChangePassword()
{
String newPwd = "2345";
Boolean result = instance.changePassword("UserUno", "password", newPwd);
- assertTrue(result);
-
+ Assert.assertTrue(result);
}
+ @Test
public void testResetPassword()
{
-
String newPwd = instance.resetPassword("UserUno");
- assertNotNull("nothing returned by resetPassword ", newPwd);
+ Assert.assertNotNull("nothing returned by resetPassword ", newPwd);
}
+
+ /**
+ * Sets the instance.
+ * @param instance the instance to set
+ */
+ public void setInstance(UserManager instance)
+ {
+ this.instance = instance;
+ }
+
}
Modified: trunk/openutils-usermanagement/src/test/resources/spring-dao.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-dao.xml 2008-02-17 09:11:48 UTC (rev 619)
+++ trunk/openutils-usermanagement/src/test/resources/spring-dao.xml 2008-02-19 10:22:39 UTC (rev 620)
@@ -1,28 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="userDAO" parent="txProxyTemplate">
- <property name="target">
- <bean class="it.openutils.usermanagement.dao.UserDAOImpl">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
- </property>
- </bean>
- <bean id="groupDAO" parent="txProxyTemplate">
- <property name="target">
- <bean class="it.openutils.usermanagement.dao.GroupDAOImpl">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
- </property>
- </bean>
- <bean id="roleDAO" parent="txProxyTemplate">
- <property name="target">
- <bean class="it.openutils.usermanagement.dao.RoleDAOImpl">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
- </property>
- </bean>
-
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ <bean id="userDAO" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="it.openutils.usermanagement.dao.UserDAOImpl">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+ </property>
+ </bean>
+ <bean id="groupDAO" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="it.openutils.usermanagement.dao.GroupDAOImpl">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+ </property>
+ </bean>
+ <bean id="roleDAO" parent="txProxyTemplate">
+ <property name="target">
+ <bean class="it.openutils.usermanagement.dao.RoleDAOImpl">
+ <property name="sessionFactory" ref="sessionFactory" />
+ </bean>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
Modified: trunk/openutils-usermanagement/src/test/resources/spring-database.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-database.xml 2008-02-17 09:11:48 UTC (rev 619)
+++ trunk/openutils-usermanagement/src/test/resources/spring-database.xml 2008-02-19 10:22:39 UTC (rev 620)
@@ -1,28 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ <!--
# ATTENZIONE: queste proprietà sono utilizzate solo per gli unit tests
# i file per la configurazione del db utilizzati dall'applicazione web sono in
# src/main/web-app/WEB-INF
--->
-<beans>
- <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location">
- <value>classpath:database.properties</value>
- </property>
- </bean>
- <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
- <property name="driverClassName">
- <value>${hibernate.connection.driver}</value>
- </property>
- <property name="url">
- <value>${hibernate.connection.url}</value>
- </property>
- <property name="username">
- <value>${hibernate.connection.username}</value>
- </property>
- <property name="password">
- <value>${hibernate.connection.password}</value>
- </property>
- </bean>
+ -->
+ <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location">
+ <value>classpath:database.properties</value>
+ </property>
+ </bean>
+ <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
+ <property name="driverClassName">
+ <value>${hibernate.connection.driver}</value>
+ </property>
+ <property name="url">
+ <value>${hibernate.connection.url}</value>
+ </property>
+ <property name="username">
+ <value>${hibernate.connection.username}</value>
+ </property>
+ <property name="password">
+ <value>${hibernate.connection.password}</value>
+ </property>
+ </bean>
</beans>
Modified: trunk/openutils-usermanagement/src/test/resources/spring-hibernate.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-hibernate.xml 2008-02-17 09:11:48 UTC (rev 619)
+++ trunk/openutils-usermanagement/src/test/resources/spring-hibernate.xml 2008-02-19 10:22:39 UTC (rev 620)
@@ -1,47 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-"http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
- <property name="dataSource">
- <ref bean="dataSource" />
- </property>
- <property name="configLocation">
- <value>classpath:hibernate.cfg.xml</value>
- </property>
- <property name="configurationClass">
- <value>org.hibernate.cfg.AnnotationConfiguration</value>
- </property>
- <property name="hibernateProperties">
- <props>
- <prop key="hibernate.dialect">${hibernate.dialect}</prop>
- <prop key="hibernate.generate_statistics">false</prop>
- <prop key="hibernate.bytecode.use_reflection_optimizer">true</prop>
- <prop key="hibernate.show_sql">false</prop>
- <prop key="hibernate.use_sql_comments">false</prop>
- <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
- </props>
- </property>
- </bean>
- <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
- <property name="sessionFactory">
- <ref local="sessionFactory" />
- </property>
- </bean>
- <bean id="txProxyTemplate" abstract="true"
- class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
- <property name="transactionManager">
- <ref bean="transactionManager" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="save*">PROPAGATION_REQUIRED</prop>
- <prop key="delete*">PROPAGATION_REQUIRED</prop>
- <prop key="update*">PROPAGATION_REQUIRED</prop>
- <prop key="clean*">PROPAGATION_REQUIRED</prop>
- <prop key="*">PROPAGATION_REQUIRED,readOnly</prop>
- </props>
- </property>
- </bean>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+ <property name="dataSource">
+ <ref bean="dataSource" />
+ </property>
+ <property name="configLocation">
+ <value>classpath:hibernate.cfg.xml</value>
+ </property>
+ <property name="configurationClass">
+ <value>org.hibernate.cfg.AnnotationConfiguration</value>
+ </property>
+ <property name="hibernateProperties">
+ <props>
+ <prop key="hibernate.dialect">${hibernate.dialect}</prop>
+ <prop key="hibernate.generate_statistics">false</prop>
+ <prop key="hibernate.bytecode.use_reflection_optimizer">true</prop>
+ <prop key="hibernate.show_sql">false</prop>
+ <prop key="hibernate.use_sql_comments">false</prop>
+ <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
+ </props>
+ </property>
+ </bean>
+ <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+ <property name="sessionFactory">
+ <ref local="sessionFactory" />
+ </property>
+ </bean>
+ <bean id="txProxyTemplate" abstract="true"
+ class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+ <property name="transactionManager">
+ <ref bean="transactionManager" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="save*">PROPAGATION_REQUIRED</prop>
+ <prop key="delete*">PROPAGATION_REQUIRED</prop>
+ <prop key="update*">PROPAGATION_REQUIRED</prop>
+ <prop key="clean*">PROPAGATION_REQUIRED</prop>
+ <prop key="*">PROPAGATION_REQUIRED,readOnly</prop>
+ </props>
+ </property>
+ </bean>
</beans>
\ No newline at end of file
Modified: trunk/openutils-usermanagement/src/test/resources/spring-managers.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-managers.xml 2008-02-17 09:11:48 UTC (rev 619)
+++ trunk/openutils-usermanagement/src/test/resources/spring-managers.xml 2008-02-19 10:22:39 UTC (rev 620)
@@ -1,21 +1,27 @@
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
- <bean id="userManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"
- autowire="byType">
- <property name="transactionManager">
- <ref bean="transactionManager" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="*">PROPAGATION_REQUIRED</prop>
- </props>
- </property>
- <property name="target">
- <bean class="it.openutils.usermanagement.manager.UserManagerImpl" autowire="byType"></bean>
- </property>
- </bean>
- <bean id="passwordEncoder" class="org.acegisecurity.providers.encoding.ShaPasswordEncoder" />
- <bean id="userDetailsService" class="it.openutils.usermanagement.acegi.HibernateUserDetailsServiceImpl"
- autowire="byType">
- </bean>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ <bean id="userManager" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+ <property name="transactionManager">
+ <ref bean="transactionManager" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="*">PROPAGATION_REQUIRED</prop>
+ </props>
+ </property>
+ <property name="target">
+ <bean class="it.openutils.usermanagement.manager.UserManagerImpl">
+ <property name="passwordEncoder" ref="passwordEncoder" />
+ <property name="userDAO" ref="userDAO" />
+ </bean>
+ </property>
+ </bean>
+ <bean id="passwordEncoder" class="org.acegisecurity.providers.encoding.ShaPasswordEncoder" />
+ <bean id="userDetailsService" class="it.openutils.usermanagement.acegi.HibernateUserDetailsServiceImpl"
+ autowire="byType">
+ <property name="userDao" ref="userDAO" />
+ <property name="groupDAO" ref="groupDAO" />
+ </bean>
</beans>
\ No newline at end of file
Modified: trunk/openutils-usermanagement/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-usermanagement/src/test/resources/spring-tests.xml 2008-02-17 09:11:48 UTC (rev 619)
+++ trunk/openutils-usermanagement/src/test/resources/spring-tests.xml 2008-02-19 10:22:39 UTC (rev 620)
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
- <import resource="classpath:spring-database.xml" />
- <import resource="classpath:spring-hibernate.xml" />
- <import resource="classpath:spring-dao.xml" />
- <import resource="classpath:spring-managers.xml" />
-</beans>
\ No newline at end of file
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+ <import resource="classpath:spring-database.xml" />
+ <import resource="classpath:spring-hibernate.xml" />
+ <import resource="classpath:spring-dao.xml" />
+ <import resource="classpath:spring-managers.xml" />
+</beans>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
