[jbpm-commits] JBoss JBPM SVN: r4938 - jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe.

Author: alex.guizar(a)jboss.com Date: 2009-05-28 12:51:42 -0400 (Thu, 28 May 2009) New Revision: 4938 Modified: jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java Log: JBPM-1812: Fix tests that don't cleanup the database (RESOLVED) Merge r3699 from trunk Modified: jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java 2009-05-28 15:28:14 UTC (rev 4937) +++ jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableLongIdDbTest.java 2009-05-28 16:51:42 UTC (rev 4938) @@ -58,28 +58,26 @@ ProcessDefinition processDefinition = new ProcessDefinition(); processDefinition.addDefinition(new ContextDefinition()); graphSession.saveProcessDefinition(processDefinition); + CustomLongClass customLongObject = null; try { // create the process instance ProcessInstance processInstance = new ProcessInstance(processDefinition); - // set the jbpmSession in the context because its used to determine the - // jbpm-type for the custom object. ContextInstance contextInstance = processInstance.getContextInstance(); - // create the custom object - CustomLongClass customLongObject = new CustomLongClass("customname"); + customLongObject = new CustomLongClass("customname"); contextInstance.setVariable("custom hibernate object", customLongObject); processInstance = saveAndReload(processInstance); contextInstance = processInstance.getContextInstance(); - // get the custom hibernatable object from the variableInstances + // get the custom hibernatable object from the variables customLongObject = (CustomLongClass) contextInstance.getVariable("custom hibernate object"); assertNotNull(customLongObject); assertEquals("customname", customLongObject.getName()); } finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); + if (customLongObject != null) session.delete(customLongObject); } - } } Modified: jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java 2009-05-28 15:28:14 UTC (rev 4937) +++ jbpm3/branches/jbpm-3.2.5-soa/modules/core/src/test/java/org/jbpm/context/exe/CustomVariableStringIdDbTest.java 2009-05-28 16:51:42 UTC (rev 4938) @@ -58,27 +58,26 @@ ProcessDefinition processDefinition = new ProcessDefinition(); processDefinition.addDefinition(new ContextDefinition()); graphSession.saveProcessDefinition(processDefinition); + CustomStringClass customStringObject = null; try { // create the process instance ProcessInstance processInstance = new ProcessInstance(processDefinition); - // set the jbpmSession in the context because its used to determine the - // jbpm-type for the custom object. ContextInstance contextInstance = processInstance.getContextInstance(); - // create the custom object - CustomStringClass customStringObject = new CustomStringClass("customname"); + customStringObject = new CustomStringClass("customname"); contextInstance.setVariable("custom hibernate object", customStringObject); processInstance = saveAndReload(processInstance); contextInstance = processInstance.getContextInstance(); - // get the custom hibernatable object from the variableInstances + // get the custom hibernatable object from the variables customStringObject = (CustomStringClass) contextInstance.getVariable("custom hibernate object"); assertNotNull(customStringObject); assertEquals("customname", customStringObject.getName()); } finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); + if (customStringObject != null) session.delete(customStringObject); } } }