[jbpm-commits] JBoss JBPM SVN: r2535 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/db.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Oct 14 05:49:31 EDT 2008
Author: tom.baeyens at jboss.com
Date: 2008-10-14 05:49:31 -0400 (Tue, 14 Oct 2008)
New Revision: 2535
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java
Log:
[JBPM-1739] Cleanup GraphSessionDbTest
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java 2008-10-14 09:30:22 UTC (rev 2534)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java 2008-10-14 09:49:31 UTC (rev 2535)
@@ -34,41 +34,30 @@
public void testProcessDefinitionSaveAndLoad()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// create a process definition
ProcessDefinition processDefinition = new ProcessDefinition("auction");
// save it in the database
graphSession.saveProcessDefinition(processDefinition);
try
{
+ // get the assigned id
+ long processDefinitionId = processDefinition.getId();
+ // start a new transaction
+ newTransaction();
+ // load the process definition by the id
+ processDefinition = graphSession.loadProcessDefinition(processDefinitionId);
+ // check the result
+ assertEquals("auction", processDefinition.getName());
}
finally
{
+ // cleanup
jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
}
- // get the assigned id
- long processDefinitionId = processDefinition.getId();
- // start a new transaction
- newTransaction();
- // load the process definition by the id
- processDefinition = graphSession.loadProcessDefinition(processDefinitionId);
- // check the result
- assertEquals("auction", processDefinition.getName());
}
public void testFindProcessDefinitionByNameAndVersion()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinitionOne = new ProcessDefinition("auction");
processDefinitionOne.setVersion(1);
@@ -88,20 +77,24 @@
newTransaction();
// load the process definition by the id
- processDefinitionThree = graphSession.findProcessDefinition("auction", 2);
- assertEquals(secondVersionProcessDefinitionId, processDefinitionThree.getId());
- assertEquals("auction", processDefinitionThree.getName());
- assertEquals(2, processDefinitionThree.getVersion());
+ processDefinitionTwo = graphSession.findProcessDefinition("auction", 2);
+ assertEquals(secondVersionProcessDefinitionId, processDefinitionTwo.getId());
+ assertEquals("auction", processDefinitionTwo.getName());
+ assertEquals(2, processDefinitionTwo.getVersion());
+
+ // start a new transaction
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinitionOne.getId());
+ newTransaction();
+ graphSession.deleteProcessDefinition(processDefinitionTwo.getId());
+ newTransaction();
+ graphSession.deleteProcessDefinition(processDefinitionThree.getId());
}
public void testFindLatestProcessDefinition() throws Exception
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinition = new ProcessDefinition("auction");
processDefinition.setVersion(1);
@@ -123,16 +116,22 @@
assertEquals(lastVersionProcessDefinitionId, processDefinition.getId());
assertEquals("auction", processDefinition.getName());
assertEquals(3, processDefinition.getVersion());
+
+ newTransaction();
+
+ // cleanup
+ processDefinition = graphSession.findProcessDefinition("auction", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 3);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testFindAllProcessDefinitions() throws Exception
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinition = new ProcessDefinition("auction");
processDefinition.setVersion(1);
@@ -168,16 +167,28 @@
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitions.get(3)).getName());
assertEquals(1, ((ProcessDefinition)allProcessDefinitions.get(4)).getVersion());
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitions.get(4)).getName());
+
+ newTransaction();
+
+ // cleanup
+ processDefinition = graphSession.findProcessDefinition("auction", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 3);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testFindAllProcessDefinitionVersions() throws Exception
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinition = new ProcessDefinition("auction");
processDefinition.setVersion(1);
@@ -216,27 +227,38 @@
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitionVersions.get(0)).getName());
assertEquals(1, ((ProcessDefinition)allProcessDefinitionVersions.get(1)).getVersion());
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitionVersions.get(1)).getName());
+
+ newTransaction();
+
+ // cleanup
+ processDefinition = graphSession.findProcessDefinition("auction", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 3);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testSaveAndLoadProcessInstance()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
+ ProcessInstance processInstance = new ProcessInstance();
+ processInstance = saveAndReload(processInstance);
+ assertNotNull(processInstance);
- assertNotNull(saveAndReload(new ProcessInstance()));
+ // cleanup
+ session.delete(processInstance);
}
public void testUpdateProcessInstance()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
@@ -253,16 +275,15 @@
processInstance = saveAndReload(processInstance);
assertEquals("n", processInstance.getRootToken().getNode().getName());
assertEquals(pid, processInstance.getId());
+
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testFindProcessInstancesByProcessDefinition()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
@@ -287,16 +308,15 @@
assertTrue(previousStart >= processStart);
previousStart = processStart;
}
+
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testDeleteProcessInstance()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
graphSession.saveProcessDefinition(processDefinition);
@@ -310,16 +330,15 @@
newTransaction();
assertEquals(0, graphSession.findProcessInstances(processDefinition.getId()).size());
+
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testDeleteProcessInstanceWithVariables()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='start'>" + " <transition to='fork' />"
+ " </start-state>" + " <fork name='fork'>" + " <transition name='a' to='a' />" + " <transition name='b' to='b' />" + " </fork>"
+ " <state name='a' />" + " <state name='b' />" + "</process-definition>");
@@ -344,16 +363,13 @@
List processInstances = graphSession.findProcessInstances(processDefinition.getId());
assertEquals(0, processInstances.size());
+
+ newTransaction();
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testDeleteProcessDefinition()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
graphSession.saveProcessDefinition(processDefinition);
@@ -374,12 +390,6 @@
public void testLatestProcessDefinitions()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition websale = new ProcessDefinition("websale");
jbpmContext.deployProcessDefinition(websale);
jbpmContext.deployProcessDefinition(websale);
@@ -395,18 +405,12 @@
assertEquals(2, latestProcessDefinitions.size());
assertEquals(3, getVersionOfProcess("websale", latestProcessDefinitions));
assertEquals(2, getVersionOfProcess("change nappy", latestProcessDefinitions));
- }
- public void testCalculateAverageTimeByNode()
- {
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
- List foo = graphSession.calculateAverageTimeByNode(1L, 3000L);
- // System.out.println("Foo has " + foo.size() + " members");
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(websale.getId());
+ graphSession.deleteProcessDefinition(changeNappy.getId());
}
private int getVersionOfProcess(String name, List latestProcessDefinitions)
More information about the jbpm-commits
mailing list