[jbpm-commits] JBoss JBPM SVN: r2225 - in jbpm3/trunk/modules/core/src/test/java/org/jbpm: context/exe and 13 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Sep 13 08:17:48 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-13 08:17:48 -0400 (Sat, 13 Sep 2008)
New Revision: 2225

Modified:
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/scheduler/exe/TimerDbTest.java
   jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/TaskLogDbTest.java
Log:
Add missing calls to setUp and tearDown

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -35,18 +35,22 @@
 
 public class JbpmConfigurationTest extends TestCase {
 
-  public void setUp() {
+  public void setUp() throws Exception 
+  {
+    super.setUp();
     JbpmConfiguration.instances = new HashMap();
     JbpmConfiguration.defaultObjectFactory = null;
     JbpmConfiguration.jbpmConfigurationsStacks =  new ThreadLocal();
     JbpmContext.currentContextsStack = new ThreadLocal();
   }
   
-  public void tearDown() {
+  public void tearDown() throws Exception 
+  {
     JbpmConfiguration.instances = new HashMap();
     JbpmConfiguration.defaultObjectFactory = null;
     JbpmConfiguration.jbpmConfigurationsStacks =  new ThreadLocal();
     JbpmContext.currentContextsStack = new ThreadLocal();
+    super.tearDown();
   }
   
   public void testSingleton() {

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -36,16 +36,20 @@
 
 public class JbpmContextTest extends TestCase {
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     JbpmConfiguration.instances = new HashMap();
     JbpmConfiguration.defaultObjectFactory = null;
     JbpmContext.currentContextsStack = new ThreadLocal();
   }
-  
-  public void tearDown() {
+
+  public void tearDown() throws Exception
+  {
     JbpmConfiguration.instances = new HashMap();
     JbpmConfiguration.defaultObjectFactory = null;
     JbpmContext.currentContextsStack = new ThreadLocal();
+    super.tearDown();
   }
   
   public void testServices() {

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -32,7 +32,9 @@
   ProcessDefinition processDefinition = null;
   ContextInstance contextInstance = null;
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     processDefinition = new ProcessDefinition();
     processDefinition.addDefinition(new ContextDefinition());
     contextInstance = new ProcessInstance(processDefinition).getContextInstance();

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -38,8 +38,9 @@
 	ProcessInstance processInstance;
 	ContextInstance contextInstance;
 
-	public void setUp() throws Exception {
-		super.setUp();
+	public void setUp() throws Exception
+  {
+    super.setUp();
 
 		ProcessDefinition processDefinition = new ProcessDefinition();
 		processDefinition.addDefinition(new ContextDefinition());

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -36,7 +36,9 @@
   private ProcessInstance processInstance = null;
   private ContextInstance contextInstance = null;
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     processDefinition = new ProcessDefinition();
     processDefinition.addDefinition(new ContextDefinition());
     processInstance = new ProcessInstance( processDefinition );

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -42,7 +42,9 @@
   private ContextInstance contextInstance = null;
   private LoggingInstance loggingInstance = null;
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     processDefinition = new ProcessDefinition();
     processDefinition.addDefinition(new ContextDefinition());
     processInstance = new ProcessInstance( processDefinition );

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -21,24 +21,30 @@
  */
 package org.jbpm.file.def;
 
+import java.security.ProtectionDomain;
+
 import org.jbpm.JbpmConfiguration;
 import org.jbpm.JbpmContext;
 
-public class FileDefinitionFileSystemConfigTest extends FileDefinitionDbConfigTest {
-  
+public class FileDefinitionFileSystemConfigTest extends FileDefinitionDbConfigTest
+{
   JbpmContext jbpmContext = null;
-  
-  public void setUp() {
+
+  public void setUp() throws Exception
+  {
+    super.setUp();
+    ProtectionDomain clazz = FileDefinitionFileSystemConfigTest.class.getProtectionDomain();
     JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
-      "<jbpm-configuration>" +
-      "  <jbpm-context name='default.jbpm.context' />" +
-      "  <string name='jbpm.files.dir'>"+FileDefinitionFileSystemConfigTest.class.getProtectionDomain().getCodeSource().getLocation().getFile().toString()+"</string>" +
-      "</jbpm-configuration>"
-    );
+        "<jbpm-configuration>" + 
+        "  <jbpm-context name='default.jbpm.context' />" + 
+        "  <string name='jbpm.files.dir'>" + clazz.getCodeSource().getLocation().getFile().toString() + "</string>" + 
+        "</jbpm-configuration>");
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
-  
-  public void tearDown() {
+
+  public void tearDown() throws Exception
+  {
     jbpmContext.close();
+    super.tearDown();
   }
 }

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -66,7 +66,9 @@
     }
   }
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     executedActions = new ArrayList();
   }
 

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -66,7 +66,9 @@
     }
   }
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     executedActions = new ArrayList();
   }
 

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -35,8 +35,9 @@
 
   static List executedActions = null;
 
-  public void setUp()
+  public void setUp() throws Exception
   {
+    super.setUp();
     executedActions = new ArrayList();
   }
 

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -71,9 +71,6 @@
     }
   }
 
-  public void setUp() {
-  }
-  
   public void testSituation1() {
     scenario = 1;
     processInstance.signal();

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -62,9 +62,10 @@
     }
   }
   
-  public void setUp() throws Exception {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     executedActions = new ArrayList();
-    super.setUp();
   }
 
   /*

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -66,7 +66,9 @@
     }
   }
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     executedActions = new ArrayList();
   }
 

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -8,36 +8,40 @@
 import org.dom4j.Element;
 import org.jbpm.graph.def.ProcessDefinition;
 
-public class CustomSubProcessResolverTest extends TestCase {
-  
+public class CustomSubProcessResolverTest extends TestCase 
+{
+ 
   MapBasedProcessRepository mapBasedProcessRepository = new MapBasedProcessRepository();
-  
+
   SubProcessResolver originalSubProcessResolver = ProcessState.defaultSubProcessResolver;
-  
-  public void setUp() {
-    // you can set the default used sub process resolver with a static method
+
+  public void setUp() throws Exception
+  {
+    super.setUp();
     ProcessState.setDefaultSubProcessResolver(mapBasedProcessRepository);
-    
-    // or you can do it in the jbpm.cfg.xml with a bean named 'jbpm.sub.process.resolver'
   }
-  
-  public void tearDown() {
-    // restore the original subprocess resolver to avoid test interference
+
+  public void tearDown() throws Exception
+  {
     ProcessState.setDefaultSubProcessResolver(originalSubProcessResolver);
+    super.tearDown();
   }
 
-  public static class MapBasedProcessRepository implements SubProcessResolver {
+  public static class MapBasedProcessRepository implements SubProcessResolver
+  {
     private static final long serialVersionUID = 1L;
 
     Map processes = new HashMap();
 
-    public void add(ProcessDefinition processDefinition) {
+    public void add(ProcessDefinition processDefinition)
+    {
       processes.put(processDefinition.getName(), processDefinition);
     }
 
-    public ProcessDefinition findSubProcess(Element subProcessElement) {
+    public ProcessDefinition findSubProcess(Element subProcessElement)
+    {
       String processName = subProcessElement.attributeValue("name");
-      return (ProcessDefinition) processes.get(processName);
+      return (ProcessDefinition)processes.get(processName);
     }
   }
   

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -25,6 +25,7 @@
 
   protected void setUp() throws Exception
   {
+    super.setUp();
     logs = new ArrayList();
     testInterceptor = new TestInterceptor();
     UserCodeInterceptorConfig.setUserCodeInterceptor(testInterceptor);
@@ -35,6 +36,7 @@
     UserCodeInterceptorConfig.setUserCodeInterceptor(null);
     testInterceptor = null;
     logs = null;
+    super.tearDown();
   }
   
   public void testAction() 

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -34,7 +34,9 @@
   
   ExecutionContext executionContext = null;
   
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     ProcessDefinition processDefinition = new ProcessDefinition();
     ProcessInstance processInstance = new ProcessInstance(processDefinition);
     executionContext = new ExecutionContext(processInstance.getRootToken());

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -58,7 +58,9 @@
     }
   }
 
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     pd = ProcessDefinition.parseXmlString(
       "<process-definition>" +
       "  <start-state name='a'>" +

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -74,6 +74,8 @@
 
   protected void setUp() throws Exception
   {
+    super.setUp();
+    
     dbf = DocumentBuilderFactory.newInstance();
     dbf.setValidating(true);
     dbf.setNamespaceAware(true);
@@ -132,11 +134,6 @@
     }
   }
 
-  protected void tearDown() throws Exception
-  {
-    super.tearDown();
-  }
-
   public static void printDocument(Document document)
   {
     log.debug(XmlUtil.toString(document.getDocumentElement()));

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -37,14 +37,18 @@
   SimpleSmtpServer server = null;
   JbpmContext jbpmContext = null;
 
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     server = SimpleSmtpServer.start(23583);
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
 
-  public void tearDown() {
+  public void tearDown() throws Exception
+  {
     jbpmContext.close();
     server.stop();
+    super.tearDown();
   }
 
   public void testWithoutAddressResolving() {

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -45,15 +45,18 @@
 
   JbpmContext jbpmContext = null;
 
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
 
-  public void tearDown() {
+  public void tearDown() throws Exception
+  {
     jbpmContext.close();
+    super.tearDown();
   }
 
-  
   public void testSimplMail() {
     String actors = "sample.manager at localhost";
     String subject = "latest news";

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -40,14 +40,18 @@
   SimpleSmtpServer server = null;
   JbpmContext jbpmContext = null;
 
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     server = SimpleSmtpServer.start(23583);
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
 
-  public void tearDown() {
+  public void tearDown() throws Exception
+  {
     jbpmContext.close();
     server.stop();
+    super.tearDown();
   }
 
   public static class RoundRobinAssigner implements AssignmentHandler {

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -45,12 +45,16 @@
   
   JbpmContext jbpmContext = null;
   
-  public void setUp(){
+  public void setUp() throws Exception
+  {
+    super.setUp();
     jbpmContext = jbpmConfiguration.createJbpmContext();
   }
-  
-  public void tearDown() {
+
+  public void tearDown() throws Exception
+  {
     jbpmContext.close();
+    super.tearDown();
   }
   
   protected void newTransaction() {

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -15,8 +15,9 @@
   JbpmContext jbpmContext = null;
   MockSessionFactory mockSessionFactory = null;
   
-  protected void setUp() {
-    // for all of these tests, the default configuration is used
+  protected void setUp() throws Exception
+  {
+    super.setUp();
     jbpmConfiguration = JbpmConfiguration.parseXmlString(
       "<jbpm-configuration>" +
       "  <jbpm-context>" +
@@ -40,10 +41,12 @@
     jbpmContext.setSessionFactory(mockSessionFactory);
   }
 
-  protected void tearDown() {
+  protected void tearDown() throws Exception
+  {
     jbpmConfiguration = null;
     jbpmContext = null;
     mockSessionFactory = null;
+    super.tearDown();
   }
 
   // with hibernate transactions

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -13,18 +13,21 @@
   JbpmContext jbpmContext = null;
   MockSessionFactory mockSessionFactory = null;
   
-  public void setUp() {
-    // for all of these tests, the default configuration is used
+  public void setUp() throws Exception
+  {
+    super.setUp();
     jbpmConfiguration = JbpmConfiguration.getInstance();
     jbpmContext = jbpmConfiguration.createJbpmContext();
     mockSessionFactory = new MockSessionFactory();
     jbpmContext.setSessionFactory(mockSessionFactory);
   }
-  
-  public void tearDown() {
+
+  public void tearDown() throws Exception
+  {
     jbpmConfiguration = null;
     jbpmContext = null;
     mockSessionFactory = null;
+    super.tearDown();
   }
 
   // with hibernate transactions

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -33,12 +33,16 @@
 
 public class PersistenceServiceFactoryDbTest extends TestCase {
 
-  public void setUp() {
+  public void setUp() throws Exception
+  {
+    super.setUp();
     Jndi.initialize();
   }
 
-  public void tearDown() {
+  public void tearDown() throws Exception
+  {
     Jndi.reset();
+    super.tearDown();
   }
 
   public void testDefaults() {

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/scheduler/exe/TimerDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/scheduler/exe/TimerDbTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/scheduler/exe/TimerDbTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -42,15 +42,12 @@
 
 	static boolean isNoOpExecuted = false;
 
-	public void setUp() throws Exception {
-		super.setUp();
-		isNoOpExecuted = false;
-	}
+	public void setUp() throws Exception
+  {
+    super.setUp();
+    isNoOpExecuted = false;
+  }
 
-	public void tearDown() throws Exception {
-		super.tearDown();
-	}
-
 	public void testSaveTimer() {
 		final Date now = Calendar.getInstance().getTime();
 

Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/TaskLogDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/TaskLogDbTest.java	2008-09-13 11:51:23 UTC (rev 2224)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/TaskLogDbTest.java	2008-09-13 12:17:48 UTC (rev 2225)
@@ -28,16 +28,17 @@
   
   TaskInstance taskInstance = null;
   
-  public void setUp() throws Exception {
+  public void setUp() throws Exception
+  {
     super.setUp();
-    
     taskInstance = new TaskInstance();
     session.save(taskInstance);
   }
-  
-  public void tearDown() throws Exception {
+
+  public void tearDown() throws Exception
+  {
+    taskInstance = null;
     super.tearDown();
-    taskInstance = null;
   }
 
   public void testTaskCreateLog() {




More information about the jbpm-commits mailing list