Author: seanahn
Date: Fri Mar 27 23:55:39 2009
New Revision: 759394
URL: http://svn.apache.org/viewvc?rev=759394&view=rev
Log:
fixed process store tests
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=759394&r1=759393&r2=759394&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Fri Mar 27 23:55:39 2009
@@ -321,7 +321,7 @@
resources hibernate_doclet(:package=>"org.apache.ode.store.hib",
:excludedtags=>"@version,@author,@todo")
test.with COMMONS.collections, COMMONS.lang, JAVAX.connector,
JAVAX.transaction, DOM4J, LOG4J,
- XERCES, XALAN, JAXEN, SAXON, OPENJPA
+ XERCES, XALAN, JAXEN, SAXON, OPENJPA, GERONIMO.transaction
package :jar
end
Modified:
ode/branches/APACHE_ODE_1.X/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java?rev=759394&r1=759393&r2=759394&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-store/src/test/java/org/apache/ode/store/hib/DaoTest.java
Fri Mar 27 23:55:39 2009
@@ -48,17 +48,16 @@
}
public void testEmpty() {
- ConfStoreConnection conn = cf.getConnection();
cf.beginTransaction();
+ ConfStoreConnection conn = cf.getConnection();
assertEquals(0, conn.getDeploymentUnits().size());
assertNull(conn.getDeploymentUnit("foobar"));
cf.commitTransaction();
- conn.close();
}
public void testCreateDU() {
- ConfStoreConnection conn = cf.getConnection();
cf.beginTransaction();
+ ConfStoreConnection conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.createDeploymentUnit("foo");
assertNotNull(du);
@@ -66,11 +65,10 @@
assertNotNull(du.getDeployDate());
} finally {
cf.commitTransaction();
- conn.close();
}
- conn = cf.getConnection();
cf.beginTransaction();
+ conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.getDeploymentUnit("foo");
assertNotNull(du);
@@ -82,8 +80,8 @@
}
public void testRollback() {
- ConfStoreConnection conn = cf.getConnection();
cf.beginTransaction();
+ ConfStoreConnection conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.createDeploymentUnit("foo");
assertNotNull(du);
@@ -91,23 +89,21 @@
assertNotNull(du.getDeployDate());
} finally {
cf.rollbackTransaction();
- conn.close();
}
- conn = cf.getConnection();
cf.beginTransaction();
+ conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.getDeploymentUnit("foo");
assertNull(du);
} finally {
cf.commitTransaction();
}
-
}
public void testGetDeploymentUnits() {
- ConfStoreConnection conn = cf.getConnection();
cf.beginTransaction();
+ ConfStoreConnection conn = cf.getConnection();
try {
conn.createDeploymentUnit("foo1");
conn.createDeploymentUnit("foo2");
@@ -115,10 +111,10 @@
conn.createDeploymentUnit("foo4");
} finally {
cf.commitTransaction();
- conn.close();
}
- conn = cf.getConnection();
+
cf.beginTransaction();
+ conn = cf.getConnection();
try {
assertNotNull(conn.getDeploymentUnit("foo1"));
assertNotNull(conn.getDeploymentUnit("foo2"));
@@ -130,11 +126,10 @@
}
}
-
public void testCreateProcess() {
QName foobar = new QName("foo","bar");
- ConfStoreConnection conn = cf.getConnection();
cf.beginTransaction();
+ ConfStoreConnection conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.createDeploymentUnit("foo1");
ProcessConfDAO p = du.createProcess(foobar,foobar,1);
@@ -144,11 +139,10 @@
assertEquals("foo1", p.getDeploymentUnit().getName());
} finally {
cf.commitTransaction();
- conn.close();
}
- conn = cf.getConnection();
cf.beginTransaction();
+ conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.getDeploymentUnit("foo1");
ProcessConfDAO p = du.getProcess(foobar);
@@ -157,29 +151,25 @@
assertEquals(foobar,p.getPID());
assertEquals(foobar,p.getType());
-
} finally {
cf.commitTransaction();
- conn.close();
}
-
}
public void testProcessProperties() {
QName foobar = new QName("foo","bar");
- ConfStoreConnection conn = cf.getConnection();
cf.beginTransaction();
+ ConfStoreConnection conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.createDeploymentUnit("foo1");
ProcessConfDAO p = du.createProcess(foobar,foobar,1);
p.setProperty(foobar,"baz");
} finally {
cf.commitTransaction();
- conn.close();
}
- conn = cf.getConnection();
cf.beginTransaction();
+ conn = cf.getConnection();
try {
DeploymentUnitDAO du = conn.getDeploymentUnit("foo1");
ProcessConfDAO p = du.getProcess(foobar);
@@ -189,10 +179,6 @@
assertTrue(p.getPropertyNames().contains(foobar));
} finally {
cf.commitTransaction();
- conn.close();
}
-
-
- }
-
-}
+ }
+}
\ No newline at end of file
