Author: rr
Date: Fri May 21 04:28:37 2010
New Revision: 946868
URL: http://svn.apache.org/viewvc?rev=946868&view=rev
Log:
ODE-824: DAO test case should be executed for different DB (Thanks to Veresh
Jain)
Modified:
ode/trunk/Rakefile
ode/trunk/dao-hibernate/pom.xml
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
Modified: ode/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/ode/trunk/Rakefile?rev=946868&r1=946867&r2=946868&view=diff
==============================================================================
--- ode/trunk/Rakefile (original)
+++ ode/trunk/Rakefile Fri May 21 04:28:37 2010
@@ -277,7 +277,7 @@ define "ode" do
end
task "compile" => "hbm-hack"
- test.with project("bpel-epr"), BACKPORT, COMMONS.collections,
COMMONS.lang, DERBY, COMMONS.logging, LOG4J, SLF4J,
+ test.with project("bpel-epr"), BACKPORT, COMMONS.collections,
COMMONS.lang, DERBY, COMMONS.logging, COMMONS.pool, COMMONS.dbcp, LOG4J, SLF4J,
GERONIMO.transaction, GERONIMO.kernel, GERONIMO.connector,
JAVAX.connector, JAVAX.ejb, SPRING
package :jar
Modified: ode/trunk/dao-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/pom.xml?rev=946868&r1=946867&r2=946868&view=diff
==============================================================================
--- ode/trunk/dao-hibernate/pom.xml (original)
+++ ode/trunk/dao-hibernate/pom.xml Fri May 21 04:28:37 2010
@@ -47,6 +47,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
Modified:
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
URL:
http://svn.apache.org/viewvc/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java?rev=946868&r1=946867&r2=946868&view=diff
==============================================================================
---
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
(original)
+++
ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseTestDAO.java
Fri May 21 04:28:37 2010
@@ -19,24 +19,25 @@
package org.apache.ode.daohib.bpel;
+import java.util.Properties;
+
import javax.resource.spi.ConnectionManager;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
import junit.framework.TestCase;
+import org.apache.commons.dbcp.BasicDataSource;
import org.apache.derby.jdbc.EmbeddedXADataSource;
import org.apache.ode.bpel.dao.BpelDAOConnection;
import org.apache.ode.il.EmbeddedGeronimoFactory;
import org.hibernate.cfg.Environment;
-import java.util.Properties;
-
/**
- * Testing BpelDAOConnectionImpl.listInstance. We're just producing a lot
- * of different filter combinations and test if they execute ok. To really
- * test that the result is the one expected would take a huge test database
- * (with at least a process and an instance for every possible combination).
+ * Testing BpelDAOConnectionImpl.listInstance. We're just producing a lot of
+ * different filter combinations and test if they execute ok. To really test
+ * that the result is the one expected would take a huge test database (with at
+ * least a process and an instance for every possible combination).
*/
public abstract class BaseTestDAO extends TestCase {
@@ -44,6 +45,11 @@ public abstract class BaseTestDAO extend
protected TransactionManager txm;
protected ConnectionManager connectionManager;
private DataSource ds;
+ /*
+ * Make this true and change the getDataSource
+ * method to point to correct driver , database and userid \ password
+ */
+ private static boolean externalDB = false;
protected void initTM() throws Exception {
EmbeddedGeronimoFactory factory = new EmbeddedGeronimoFactory();
@@ -67,6 +73,19 @@ public abstract class BaseTestDAO extend
}
protected DataSource getDataSource() {
+ if (externalDB) {
+ BasicDataSource ds = new BasicDataSource();
+ try {
+ ds.setDriverClassName("com.mysql.jdbc.Driver");
+ ds.setUsername("sa");
+ ds.setPassword("sa");
+ ds.setUrl("jdbc:mysql://localhost/bpmsdbJunit");
+ this.ds = ds;
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.out.println("######### Couldn't get External
connection! #############");
+ }
+ }
if (ds == null) {
EmbeddedXADataSource ds = new EmbeddedXADataSource();
ds.setCreateDatabase("create");
@@ -82,4 +101,4 @@ public abstract class BaseTestDAO extend
return txm;
}
-}
\ No newline at end of file
+}
