[jbpm-commits] JBoss JBPM SVN: r2796 - in jbpm3/trunk/modules/core: src/test/java/org/jbpm/graph/node and 1 other directory.
Author: tom.baeyens(a)jboss.com
Date: 2008-11-07 06:23:40 -0500 (Fri, 07 Nov 2008)
New Revision: 2796
Modified:
jbpm3/trunk/modules/core/pom.xml
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java
Log:
[JBPM-1772] removed exclude for test that was fixed
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-11-07 10:18:27 UTC (rev 2795)
+++ jbpm3/trunk/modules/core/pom.xml 2008-11-07 11:23:40 UTC (rev 2796)
@@ -330,9 +330,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- [JBPM-1772] Fix JoinDbTest on postgresql -->
- <exclude>org/jbpm/jpdl/exe/JoinDbTest.java</exclude>
-
<exclude>org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java</exclude>
<!-- [JBPM-1782] Fix JoinExecutionDbTest on postgresql -->
<exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude>
<!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema
-->
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2008-11-07
10:18:27 UTC (rev 2795)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java 2008-11-07
11:23:40 UTC (rev 2796)
@@ -31,10 +31,7 @@
*/
public class JoinDbTest extends AbstractDbTestCase {
- private long processDefinitionId;
-
- protected void setUp() throws Exception {
- super.setUp();
+ public void testParentLockMode() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
"<process-definition name='" + getName() + "'>"
+
" <join name='read' lock='READ' />" +
@@ -42,22 +39,22 @@
" <join name='upgrade' lock='pessimistic' />" +
"</process-definition>");
jbpmContext.deployProcessDefinition(processDefinition);
- processDefinitionId = processDefinition.getId();
+ long processDefinitionId = processDefinition.getId();
newTransaction();
- }
+
+ try {
+ processDefinition = graphSession.findLatestProcessDefinition(getName());
+ Join join = (Join) processDefinition.getNode("read");
+ assertEquals(LockMode.READ.toString(), join.getParentLockMode());
+ join = (Join) processDefinition.getNode("nowait");
+ assertEquals(LockMode.UPGRADE_NOWAIT.toString(), join.getParentLockMode());
+ join = (Join) processDefinition.getNode("upgrade");
+ assertEquals(LockMode.UPGRADE.toString(), join.getParentLockMode());
- protected void tearDown() throws Exception {
- graphSession.deleteProcessDefinition(processDefinitionId);
- super.tearDown();
- }
+ } finally {
+ newTransaction();
+ graphSession.deleteProcessDefinition(processDefinitionId);
+ }
- public void testParentLockMode() {
- ProcessDefinition processDefinition =
graphSession.findLatestProcessDefinition(getName());
- Join join = (Join) processDefinition.getNode("read");
- assertEquals(LockMode.READ.toString(), join.getParentLockMode());
- join = (Join) processDefinition.getNode("nowait");
- assertEquals(LockMode.UPGRADE_NOWAIT.toString(), join.getParentLockMode());
- join = (Join) processDefinition.getNode("upgrade");
- assertEquals(LockMode.UPGRADE.toString(), join.getParentLockMode());
}
}