Author: mriou
Date: Mon Apr 9 09:33:45 2007
New Revision: 526820
URL: http://svn.apache.org/viewvc?view=rev&rev=526820
Log:
Preserving tests that could be saved, removing others. Writing QL tests in XML
wasn't such a good idea.
Removed:
incubator/ode/trunk/dao-hibernate/src/test/config/
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/ListProcessTest.java
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/ql/
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseDAOTest.java
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java?view=diff&rev=526820&r1=526819&r2=526820
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/CriteriaBuilder.java
Mon Apr 9 09:33:45 2007
@@ -113,11 +113,11 @@
}
if ("name".equals(orderKey)) {
- if (ascending)
processCrit.addOrder(Property.forName("processName").asc());
- else processCrit.addOrder(Property.forName("processName").desc());
+ if (ascending)
processCrit.addOrder(Property.forName("typeName").asc());
+ else processCrit.addOrder(Property.forName("typeName").desc());
} else if ("namespace".equals(orderKey)) {
- if (ascending)
processCrit.addOrder(Property.forName("processNamespace").asc());
- else
processCrit.addOrder(Property.forName("processNamespace").desc());
+ if (ascending)
processCrit.addOrder(Property.forName("typeNamespace").asc());
+ else processCrit.addOrder(Property.forName("typeNamespace").desc());
} else if ("pid".equals(orderKey)) {
if (ascending)
processCrit.addOrder(Property.forName("processId").asc());
else processCrit.addOrder(Property.forName("processId").desc());
Modified:
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java?view=diff&rev=526820&r1=526819&r2=526820
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/ProcessDaoImpl.java
Mon Apr 9 09:33:45 2007
@@ -138,7 +138,7 @@
_process.getCorrelators().add(correlator);
getSession().save(correlator);
getSession().saveOrUpdate(_process);
- return correlator;
+ return new CorrelatorDaoImpl(_sm, correlator);
}
public int getNumInstances() {
Modified:
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseDAOTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseDAOTest.java?view=diff&rev=526820&r1=526819&r2=526820
==============================================================================
---
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseDAOTest.java
(original)
+++
incubator/ode/trunk/dao-hibernate/src/test/java/org/apache/ode/daohib/bpel/BaseDAOTest.java
Mon Apr 9 09:33:45 2007
@@ -20,11 +20,17 @@
package org.apache.ode.daohib.bpel;
import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
import junit.framework.TestCase;
import org.apache.ode.bpel.dao.BpelDAOConnection;
import org.apache.ode.il.EmbeddedGeronimoFactory;
+import org.apache.ode.utils.GUID;
+import org.hsqldb.jdbc.jdbcDataSource;
+import org.hibernate.cfg.Environment;
+
+import java.util.Properties;
/**
* Testing BpelDAOConnectionImpl.listInstance. We're just producing a lot
@@ -34,34 +40,43 @@
*/
public class BaseDAOTest extends TestCase {
- protected BpelDAOConnection daoConn;
- private TransactionManager txm;
- private DataSource ds;
-
- protected void initTM() throws Exception {
-
- EmbeddedGeronimoFactory factory = new EmbeddedGeronimoFactory();
- txm = factory.getTransactionManager();
- ds = getDataSource();
- txm.begin();
-
- BpelDAOConnectionFactoryImpl factoryImpl = new
BpelDAOConnectionFactoryImpl();
- factoryImpl.setTransactionManager(txm);
- factoryImpl.setDataSource(ds);
-
- daoConn = factoryImpl.getConnection();
- }
-
- protected void stopTM() throws Exception {
- txm.commit();
- }
-
- protected DataSource getDataSource() {
- throw new Error("Not implemented");
- }
-
- protected TransactionManager getTransactionManager() {
- return txm;
- }
+ protected BpelDAOConnection daoConn;
+ private TransactionManager txm;
+ private DataSource ds;
+
+ protected void initTM() throws Exception {
+ EmbeddedGeronimoFactory factory = new EmbeddedGeronimoFactory();
+ txm = factory.getTransactionManager();
+ ds = getDataSource();
+ txm.begin();
+
+ BpelDAOConnectionFactoryImpl factoryImpl = new
BpelDAOConnectionFactoryImpl();
+ factoryImpl.setTransactionManager(txm);
+ factoryImpl.setDataSource(ds);
+ Properties props = new Properties();
+ props.put(Environment.HBM2DDL_AUTO, "create-drop");
+ factoryImpl.init(props);
+
+ daoConn = factoryImpl.getConnection();
+ }
+
+ protected void stopTM() throws Exception {
+ txm.commit();
+ }
+
+ protected DataSource getDataSource() {
+ if (ds == null) {
+ jdbcDataSource hsqlds = new jdbcDataSource();
+ hsqlds.setDatabase("jdbc:hsqldb:mem:" + new GUID().toString());
+ hsqlds.setUser("sa");
+ hsqlds.setPassword("");
+ ds = hsqlds;
+ }
+ return ds;
+ }
+
+ protected TransactionManager getTransactionManager() {
+ return txm;
+ }
}
