[jbpm-commits] JBoss JBPM SVN: r2230 - in jbpm3/trunk/modules/core/src: main/java/org/jbpm/db and 21 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-09-13 12:50:14 -0400 (Sat, 13 Sep 2008) New Revision: 2230 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 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/TokenVariableMapDbTest.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/context/log/VariableUpdateDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/IdAssignmentDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.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/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/jbpm1106/JBPM1106Test.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.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/patterns/Wfp18InterleavedParallelRoutingTest.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/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/svc/CloseSequenceTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskMgmtInstanceDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/SwimlaneLogDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/TaskLogDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java Log: More debug Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -23,8 +23,23 @@ import junit.framework.TestCase; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + public abstract class AbstractJbpmTestCase extends TestCase { + private static Log log = LogFactory.getLog(AbstractJbpmTestCase.class); + + protected void setUp() throws Exception + { + log.debug("### START " + getLongName() + " ####################################################"); + } + + protected void tearDown() throws Exception + { + log.debug("### END " + getLongName() + " ######################################################"); + } + protected String getShortName() { String shortName = getClass().getName(); Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -30,7 +30,6 @@ import org.hibernate.tool.hbm2ddl.SchemaExport; import org.jbpm.AbstractJbpmTestCase; import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmConfigurationTestHelper; import org.jbpm.JbpmContext; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; @@ -41,6 +40,8 @@ public abstract class AbstractDbTestCase extends AbstractJbpmTestCase { + private static Log log = LogFactory.getLog(AbstractDbTestCase.class); + private JbpmConfiguration jbpmConfiguration; protected JbpmContext jbpmContext; @@ -55,36 +56,25 @@ protected JobExecutor jobExecutor; - public void setUp() throws Exception + protected void setUp() throws Exception { - log.debug("### starting " + getLongName() + " ####################################################"); super.setUp(); - try - { - // TODO: This creates the schema on EVERY test - createSchema(); + // TODO: This creates the schema on EVERY test + createSchema(); - // If a clean DB is realy needed this should perhaps be done - //cleanSchema(); + // If a clean DB is realy needed this should perhaps be done + // cleanSchema(); - createJbpmContext(); - initializeMembers(); - } - catch (Exception ex) - { - // Note, that if setUp fails a call to tearDown will not happen. - log.error("Exception is setUp, tearDown will not get called", ex); - throw ex; - } + createJbpmContext(); + initializeMembers(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { resetMembers(); closeJbpmContext(); super.tearDown(); - log.debug("### " + getLongName() + " done ####################################################"); } public void beginSessionTransaction() @@ -337,6 +327,4 @@ jobSession = null; contextSession = null; } - - private static Log log = LogFactory.getLog(AbstractDbTestCase.class); } 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -33,7 +33,7 @@ public class JbpmConfigurationTest extends AbstractJbpmTestCase { - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); JbpmConfiguration.instances = new HashMap(); @@ -42,7 +42,7 @@ JbpmContext.currentContextsStack = new ThreadLocal(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { JbpmConfiguration.instances = new HashMap(); JbpmConfiguration.defaultObjectFactory = null; 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -34,7 +34,7 @@ public class JbpmContextTest extends AbstractJbpmTestCase { - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); JbpmConfiguration.instances = new HashMap(); @@ -42,7 +42,7 @@ JbpmContext.currentContextsStack = new ThreadLocal(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { JbpmConfiguration.instances = new HashMap(); JbpmConfiguration.defaultObjectFactory = null; Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TokenVariableMapDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TokenVariableMapDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TokenVariableMapDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -41,7 +41,7 @@ Map tokenVariableMaps; TokenVariableMap tokenVariableMap; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -31,7 +31,7 @@ ProcessDefinition processDefinition = null; ContextInstance contextInstance = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); processDefinition = new ProcessDefinition(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -41,7 +41,7 @@ ProcessInstance processInstance; ContextInstance contextInstance; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -35,7 +35,7 @@ private ProcessInstance processInstance = null; private ContextInstance contextInstance = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); processDefinition = new 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -41,7 +41,7 @@ private ContextInstance contextInstance = null; private LoggingInstance loggingInstance = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); processDefinition = new ProcessDefinition(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -41,7 +41,7 @@ private ProcessInstance processInstance = null; private ContextInstance contextInstance = null; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); processDefinition = new ProcessDefinition(); processDefinition.addDefinition(new ContextDefinition()); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/IdAssignmentDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/IdAssignmentDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/IdAssignmentDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -30,7 +30,7 @@ static int successfullInvocations = 0; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); successfullInvocations = 0; } Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -44,7 +44,7 @@ ProcessInstance processInstance = null; TaskMgmtInstance taskMgmtInstance = null; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); processDefinition = new 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionFileSystemConfigTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -30,7 +30,7 @@ { JbpmContext jbpmContext = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); ProtectionDomain clazz = FileDefinitionFileSystemConfigTest.class.getProtectionDomain(); @@ -42,7 +42,7 @@ jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() throws Exception + protected 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -65,7 +65,7 @@ } } - public void setUp() throws Exception + protected 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -65,7 +65,7 @@ } } - public void setUp() throws Exception + protected 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -34,7 +34,7 @@ static List executedActions = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); executedActions = new ArrayList(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -62,7 +62,7 @@ } } - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); executedActions = new ArrayList(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -65,7 +65,7 @@ } } - public void setUp() throws Exception + protected 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -14,13 +14,13 @@ SubProcessResolver originalSubProcessResolver = ProcessState.defaultSubProcessResolver; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); ProcessState.setDefaultSubProcessResolver(mapBasedProcessRepository); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { ProcessState.setDefaultSubProcessResolver(originalSubProcessResolver); super.tearDown(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1106/JBPM1106Test.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1106/JBPM1106Test.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1106/JBPM1106Test.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -43,7 +43,7 @@ private CommandService commandService = new CommandServiceImpl(getJbpmConfiguration()); private ProcessDefinition processDefinition; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); processDefinition = new ProcessDefinition("Audit"); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -30,7 +30,7 @@ return "org/jbpm/jbpm.test.cfg.xml"; } - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); JobExecutor jobExecutor = getJbpmConfiguration().getJobExecutor(); @@ -38,7 +38,7 @@ jobExecutor.start(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { getJbpmConfiguration().getJobExecutor().stop(); super.tearDown(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadJoinTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -29,7 +29,7 @@ } @Override - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); start = System.currentTimeMillis(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -28,7 +28,7 @@ return "org/jbpm/job/executor/loadtests.jbpm.cfg.xml"; } - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); start = System.currentTimeMillis(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -33,7 +33,7 @@ ExecutionContext executionContext = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); ProcessDefinition processDefinition = new ProcessDefinition(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -57,7 +57,7 @@ } } - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); pd = ProcessDefinition.parseXmlString( Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -87,7 +87,7 @@ } } - public void setUp() { + protected void setUp() { interleaveStart.setInterleaver(new ScenarioInterleaver()); } 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -34,14 +34,14 @@ SimpleSmtpServer server = null; JbpmContext jbpmContext = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); server = SimpleSmtpServer.start(23583); jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { jbpmContext.close(); server.stop(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -44,13 +44,13 @@ JbpmContext jbpmContext = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { jbpmContext.close(); super.tearDown(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -39,14 +39,14 @@ SimpleSmtpServer server = null; JbpmContext jbpmContext = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); server = SimpleSmtpServer.start(23583); jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { jbpmContext.close(); server.stop(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -44,13 +44,13 @@ JbpmContext jbpmContext = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); jbpmContext = jbpmConfiguration.createJbpmContext(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { jbpmContext.close(); super.tearDown(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -12,7 +12,7 @@ JbpmContext jbpmContext = null; MockSessionFactory mockSessionFactory = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); jbpmConfiguration = JbpmConfiguration.getInstance(); @@ -21,7 +21,7 @@ jbpmContext.setSessionFactory(mockSessionFactory); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { jbpmConfiguration = null; jbpmContext = null; 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -32,13 +32,13 @@ public class PersistenceServiceFactoryDbTest extends AbstractJbpmTestCase { - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); Jndi.initialize(); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { Jndi.reset(); super.tearDown(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/scheduler/exe/TimerDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -42,7 +42,7 @@ static boolean isNoOpExecuted = false; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); isNoOpExecuted = false; Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/CloseSequenceTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/CloseSequenceTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/CloseSequenceTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -59,7 +59,7 @@ JbpmConfiguration jbpmConfiguration = null; - public void setUp() { + protected void setUp() { closedServices = new ArrayList(); jbpmConfiguration = JbpmConfiguration.parseXmlString( "<jbpm-configuration>" + Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -34,7 +34,7 @@ Task laundry = null; Task dishes = null; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); processDefinition = new ProcessDefinition(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -33,7 +33,7 @@ Task laundry = null; Task dishes = null; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); processDefinition = new ProcessDefinition(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -41,7 +41,7 @@ static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance("org/jbpm/jbpm.test.cfg.xml"); static int invocationCount = 0; - public void setUp() { + protected void setUp() { invocationCount = 0; } Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -39,7 +39,7 @@ } } - public void setUp() { + protected void setUp() { counter = 0; } Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskMgmtInstanceDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskMgmtInstanceDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskMgmtInstanceDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -42,7 +42,7 @@ ProcessInstance processInstance = null; TaskMgmtInstance taskMgmtInstance = null; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); processDefinition = new ProcessDefinition(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -43,7 +43,7 @@ } } - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); counter = 0; } Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/SwimlaneLogDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/SwimlaneLogDbTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/SwimlaneLogDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -28,7 +28,7 @@ SwimlaneInstance swimlaneInstance = null; - public void setUp() throws Exception { + protected void setUp() throws Exception { super.setUp(); swimlaneInstance = new SwimlaneInstance(); 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 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/log/TaskLogDbTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -28,14 +28,14 @@ TaskInstance taskInstance = null; - public void setUp() throws Exception + protected void setUp() throws Exception { super.setUp(); taskInstance = new TaskInstance(); session.save(taskInstance); } - public void tearDown() throws Exception + protected void tearDown() throws Exception { taskInstance = null; super.tearDown(); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -54,7 +54,7 @@ // the main path of execution Token token; - public void setUp() { + protected void setUp() { // create a new process instance for the given process definition processInstance = new ProcessInstance(auctionProcess); Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java 2008-09-13 15:18:56 UTC (rev 2229) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java 2008-09-13 16:50:14 UTC (rev 2230) @@ -46,7 +46,7 @@ // the main path of execution Token token; - public void setUp() { + protected void setUp() { // create a new process instance for the given process definition processInstance = new ProcessInstance(auctionProcess);