Index: test/dao/org/appfuse/dao/BaseDAOTestCase.java
===================================================================
RCS file: /cvs/appfuse/test/dao/org/appfuse/dao/BaseDAOTestCase.java,v
retrieving revision 1.11
diff -u -r1.11 BaseDAOTestCase.java
--- test/dao/org/appfuse/dao/BaseDAOTestCase.java	24 Aug 2005 15:28:57 -0000	1.11
+++ test/dao/org/appfuse/dao/BaseDAOTestCase.java	22 Sep 2005 23:20:08 -0000
@@ -9,13 +9,13 @@
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
+import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 
 /**
  * Base class for running DAO tests.
  * @author mraible
  */
-public abstract class BaseDAOTestCase extends AbstractDependencyInjectionSpringContextTests {
+public abstract class BaseDAOTestCase extends AbstractTransactionalDataSourceSpringContextTests {
     protected final Log log = LogFactory.getLog(getClass());
     protected ResourceBundle rb;
     
Index: test/dao/org/appfuse/dao/GenericDAOTest.java
===================================================================
RCS file: /cvs/appfuse/test/dao/org/appfuse/dao/GenericDAOTest.java,v
retrieving revision 1.2
diff -u -r1.2 GenericDAOTest.java
--- test/dao/org/appfuse/dao/GenericDAOTest.java	23 Aug 2005 10:12:46 -0000	1.2
+++ test/dao/org/appfuse/dao/GenericDAOTest.java	22 Sep 2005 23:12:52 -0000
@@ -7,32 +7,21 @@
  * This class tests the generic DAO and BaseDAO implementation.
  */
 public class GenericDAOTest extends BaseDAOTestCase {
-    private Class clazz;
-    private DAO dao;
+    protected DAO dao;
     
     /**
      * This method is used instead of setDAO b/c setDAO uses autowire byType
      * <code>setPopulateProtectedVariables(true)</code> can also be used, but it's
      * a little bit slower.
      */
-    public void onSetUp() throws Exception {
+    public void onSetUpBeforeTransaction() throws Exception {
         dao = (DAO) applicationContext.getBean("dao");
     }
-    
-    /**
-     * Convenience method so this class can be subclassed to test CRUDing
-     * other entities.
-     * @param clazz
-     */
-    protected void setClass(Class clazz) {
-        this.clazz = clazz;
-    }
 
     /**
      * Simple test to verify BaseDAO works.
      */
     public void testCRUD() {
-        setClass(User.class);
         User user = new User();
         // set required fields
         user.setUsername("foo");
Index: test/dao/org/appfuse/dao/RoleDAOTest.java
===================================================================
RCS file: /cvs/appfuse/test/dao/org/appfuse/dao/RoleDAOTest.java,v
retrieving revision 1.5
diff -u -r1.5 RoleDAOTest.java
--- test/dao/org/appfuse/dao/RoleDAOTest.java	28 Aug 2005 21:15:57 -0000	1.5
+++ test/dao/org/appfuse/dao/RoleDAOTest.java	22 Sep 2005 23:20:49 -0000
@@ -39,6 +39,8 @@
 
         dao.removeRole("testrole");
 
+        endTransaction();
+
         role = dao.getRole("testrole");
         assertNull(role);
     }
Index: test/dao/org/appfuse/dao/UserDAOTest.java
===================================================================
RCS file: /cvs/appfuse/test/dao/org/appfuse/dao/UserDAOTest.java,v
retrieving revision 1.12
diff -u -r1.12 UserDAOTest.java
--- test/dao/org/appfuse/dao/UserDAOTest.java	16 Sep 2005 00:58:07 -0000	1.12
+++ test/dao/org/appfuse/dao/UserDAOTest.java	22 Sep 2005 23:21:05 -0000
@@ -35,6 +35,7 @@
 
         assertNotNull(user);
         assertEquals(1, user.getRoles().size());
     }
 
     public void testUpdateUser() throws Exception {
@@ -51,7 +52,9 @@
         // verify that violation occurs when adding new user
         // with same username
         user.setVersion(null);
-        
+
+        endTransaction();
+
         try {
             dao.saveUser(user);
             fail("saveUser didn't throw DataIntegrityViolationException");