Thread: [Drawbridge-developers] SF.net SVN: drawbridge: [7] trunk/drawbridge/src

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7
          http://drawbridge.svn.sourceforge.net/drawbridge/?rev=7&view=rev
Author:   blamonica
Date:     2008-03-15 20:14:54 -0700 (Sat, 15 Mar 2008)

Log Message:
-----------
Completed unit test for the DatabaseDao.
Completed unit test for the RunAsAccountDao.
Removed db.properties and db.tmp artifacts from running an HSQLDB database (will add to svn:ignore with next commit)

Modified Paths:
--------------
    trunk/drawbridge/src/java/net/sf/drawbridge/dao/drawbridge-dao-spring.xml
    trunk/drawbridge/src/java/net/sf/drawbridge/dao/hibernate/AbstractHibernateDao.java
    trunk/drawbridge/src/test/net/sf/drawbridge/dao/DatabaseDaoTest.java

Added Paths:
-----------
    trunk/drawbridge/src/test/net/sf/drawbridge/dao/RunAsAccountDaoTest.java
    trunk/drawbridge/src/test/net/sf/drawbridge/test/
    trunk/drawbridge/src/test/net/sf/drawbridge/test/TestBeanFactory.java

Removed Paths:
-------------
    trunk/drawbridge/src/test/db.properties
    trunk/drawbridge/src/test/db.tmp/

Modified: trunk/drawbridge/src/java/net/sf/drawbridge/dao/drawbridge-dao-spring.xml
===================================================================

--- trunk/drawbridge/src/java/net/sf/drawbridge/dao/drawbridge-dao-spring.xml	2008-03-15 02:43:02 UTC (rev 6)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/dao/drawbridge-dao-spring.xml	2008-03-16 03:14:54 UTC (rev 7)
@@ -27,7 +27,12 @@
 		<property name="dataSource" ref="dataSource"/>
 	</bean>
 	
-	<bean id="DatabaseDao" class="net.sf.drawbridge.dao.hibernate.HibernateDatabaseDaoImpl">
+	<bean id="AbstractDao" abstract="true">
 		<property name="sessionFactory" ref="SessionFactory"/>
 	</bean>
+	
+	<bean id="DatabaseDao" parent="AbstractDao" class="net.sf.drawbridge.dao.hibernate.HibernateDatabaseDaoImpl"/>
+
+	<bean id="RunAsAccountDao" parent="AbstractDao" class="net.sf.drawbridge.dao.hibernate.HibernateRunAsAccountDaoImpl"/>
+
 </beans>

Modified: trunk/drawbridge/src/java/net/sf/drawbridge/dao/hibernate/AbstractHibernateDao.java
===================================================================
--- trunk/drawbridge/src/java/net/sf/drawbridge/dao/hibernate/AbstractHibernateDao.java	2008-03-15 02:43:02 UTC (rev 6)
+++ trunk/drawbridge/src/java/net/sf/drawbridge/dao/hibernate/AbstractHibernateDao.java	2008-03-16 03:14:54 UTC (rev 7)
@@ -36,7 +36,7 @@
 
 	public void update(T vo) {
 		if (vo != null) {
-			getHibernateTemplate().save(vo);
+			getHibernateTemplate().update(vo);
 		}
 	}
 

Deleted: trunk/drawbridge/src/test/db.properties
===================================================================
--- trunk/drawbridge/src/test/db.properties	2008-03-15 02:43:02 UTC (rev 6)
+++ trunk/drawbridge/src/test/db.properties	2008-03-16 03:14:54 UTC (rev 7)
@@ -1,17 +0,0 @@
-#HSQL Database Engine 1.9.0.0
-#Thu Mar 13 21:44:50 CDT 2008
-hsqldb.script_format=0
-runtime.gc_interval=0
-sql.enforce_strict_size=false
-hsqldb.cache_size_scale=8
-readonly=false
-hsqldb.nio_data_file=true
-hsqldb.cache_scale=15
-version=1.9.0
-hsqldb.default_table_type=memory
-hsqldb.cache_file_scale=1
-hsqldb.log_size=200
-modified=yes
-hsqldb.cache_version=1.7.0
-hsqldb.original_version=1.9.0
-hsqldb.compatible_version=1.9.0

Modified: trunk/drawbridge/src/test/net/sf/drawbridge/dao/DatabaseDaoTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/dao/DatabaseDaoTest.java	2008-03-15 02:43:02 UTC (rev 6)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/dao/DatabaseDaoTest.java	2008-03-16 03:14:54 UTC (rev 7)
@@ -1,40 +1,26 @@
 package net.sf.drawbridge.dao;
 
-import javax.transaction.Transaction;
+import java.util.List;
 
 import junit.framework.TestCase;
-import net.sf.drawbridge.dao.DatabaseDao;
+import net.sf.drawbridge.test.TestBeanFactory;
 import net.sf.drawbridge.vo.Database;
 
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.AbstractPlatformTransactionManager;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 public class DatabaseDaoTest extends TestCase {
 
-	private static BeanFactory factory = new ClassPathXmlApplicationContext("drawbridge-test-spring.xml");
-	
 	private DatabaseDao target;
 	
 	private AbstractPlatformTransactionManager txManager;
 	
-	private TransactionStatus tx = null;
-	
 	protected void setUp() {
-		txManager = (AbstractPlatformTransactionManager) factory.getBean("TxManager");
-		target = (DatabaseDao) factory.getBean("DatabaseDao");
+		txManager = (AbstractPlatformTransactionManager) TestBeanFactory.getBean("TxManager");
+		target = (DatabaseDao) TestBeanFactory.getBean("DatabaseDao");
 	}
 	
-	protected void tearDown() {
-		if (tx != null) {
-			txManager.rollback(tx);
-		}
-	}
-	
 	public void testShouldGetDatabaseObject() throws Exception {
 			Database result = target.get(0);
 			assertNotNull("result is null", result);
@@ -56,4 +42,46 @@
 			txManager.rollback(tx);
 		}
 	}
+	
+	public void testShouldSaveChangesToDatabaseObject() throws Exception {
+		TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+		try {
+			Database existing = target.get(0);
+			existing.setName("a different name");
+			target.update(existing);
+			
+			Database result = target.get(0);
+			assertEquals("a different name", result.getName());
+		} finally {
+			txManager.rollback(tx);
+		}
+	}
+	
+	public void testShouldDeleteObjectFromDatabase() throws Exception {
+		TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+		try {
+			Database existing = target.get(0);
+			assertNotNull(existing);
+			target.delete(existing);
+			
+			assertNull("should be deleted", target.get(0));
+		} finally {
+			txManager.rollback(tx);
+		}
+	}
+	
+	public void testShouldRetrieveAllObjectsFromDatabase() throws Exception {
+		TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+		try {
+			Database existing = target.get(0);
+			Database db = new Database(null, "temporary db", "jdbc:temp", existing.getDriver());
+			target.create(db);
+
+			List<Database> all = target.getAll();
+			assertEquals(2, all.size());
+		} finally {
+			txManager.rollback(tx);
+		}
+		
+	}
 }

Added: trunk/drawbridge/src/test/net/sf/drawbridge/dao/RunAsAccountDaoTest.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/dao/RunAsAccountDaoTest.java	                        (rev 0)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/dao/RunAsAccountDaoTest.java	2008-03-16 03:14:54 UTC (rev 7)
@@ -0,0 +1,86 @@
+package net.sf.drawbridge.dao;
+
+import java.util.List;
+
+import junit.framework.TestCase;
+import net.sf.drawbridge.test.TestBeanFactory;
+import net.sf.drawbridge.vo.RunAsAccount;
+
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.AbstractPlatformTransactionManager;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+public class RunAsAccountDaoTest extends TestCase {
+
+	private RunAsAccountDao target;
+	
+	private AbstractPlatformTransactionManager txManager;
+	
+	protected void setUp() {
+		txManager = (AbstractPlatformTransactionManager) TestBeanFactory.getBean("TxManager");
+		target = (RunAsAccountDao) TestBeanFactory.getBean("RunAsAccountDao");
+	}
+	
+	public void testShouldGetRunAsAccountObject() throws Exception {
+			RunAsAccount result = target.get(0);
+			assertNotNull("result is null", result);
+			assertEquals("id", new Integer(0), result.getId());
+			assertEquals("username", "sa", result.getUserName());
+			assertEquals("password", "base64", result.getPassword());
+			assertNotNull("database", result.getDatabase());
+	}
+	
+	public void testShouldCreateNewRunAsAccountObject() throws Exception {
+		TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+		try {
+			RunAsAccount existing = target.get(0);
+			RunAsAccount db = new RunAsAccount(null, "temp_user", "temp_password", existing.getDatabase());
+			target.create(db);
+			assertNotNull("id is still null", db.getId());
+		} finally {
+			txManager.rollback(tx);
+		}
+	}
+	
+	public void testShouldSaveChangesToRunAsAccountObject() throws Exception {
+		TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+		try {
+			RunAsAccount existing = target.get(0);
+			existing.setUserName("a different username");
+			target.update(existing);
+			
+			RunAsAccount result = target.get(0);
+			assertEquals("a different username", result.getUserName());
+		} finally {
+			txManager.rollback(tx);
+		}
+	}
+	
+	public void testShouldDeleteObjectFromRunAsAccount() throws Exception {
+		TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+		try {
+			RunAsAccount existing = target.get(0);
+			assertNotNull(existing);
+			target.delete(existing);
+			
+			assertNull("should be deleted", target.get(0));
+		} finally {
+			txManager.rollback(tx);
+		}
+	}
+	
+	public void testShouldRetrieveAllObjectsFromRunAsAccount() throws Exception {
+		TransactionStatus tx = txManager.getTransaction(new DefaultTransactionDefinition());
+		try {
+			RunAsAccount existing = target.get(0);
+			RunAsAccount db = new RunAsAccount(null, "temp_user", "temp_password", existing.getDatabase());
+			target.create(db);
+
+			List<RunAsAccount> all = target.getAll();
+			assertEquals(2, all.size());
+		} finally {
+			txManager.rollback(tx);
+		}
+		
+	}
+}

Added: trunk/drawbridge/src/test/net/sf/drawbridge/test/TestBeanFactory.java
===================================================================
--- trunk/drawbridge/src/test/net/sf/drawbridge/test/TestBeanFactory.java	                        (rev 0)
+++ trunk/drawbridge/src/test/net/sf/drawbridge/test/TestBeanFactory.java	2008-03-16 03:14:54 UTC (rev 7)
@@ -0,0 +1,13 @@
+package net.sf.drawbridge.test;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class TestBeanFactory {
+
+	private static BeanFactory factory = new ClassPathXmlApplicationContext("drawbridge-test-spring.xml");
+	
+	public static Object getBean(String beanName) {
+		return factory.getBean(beanName);
+	}
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Drawbridge-developers] SF.net SVN: drawbridge: [7] trunk/drawbridge/src

drawbridge-developers