[jbpm-commits] JBoss JBPM SVN: r2650 - in jbpm3/trunk/modules/core: src/test/java/org/jbpm/job/executor and 1 other directory.

Author: tom.baeyens(a)jboss.com Date: 2008-10-29 05:22:50 -0400 (Wed, 29 Oct 2008) New Revision: 2650 Removed: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java Modified: jbpm3/trunk/modules/core/pom.xml Log: [JBPM-1721] removed JobLoadJoinTest and JobLoadSubProcessTest Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-29 00:58:23 UTC (rev 2649) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-29 09:22:50 UTC (rev 2650) @@ -220,12 +220,14 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> - <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> - <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> + <!-- https://jira.jboss.org/jira/browse/JBPM-1709 --> + <exclude>org/jbpm/scheduler/exe/TimerDbTest.java</exclude> + <exclude>org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java</exclude> + <!-- https://jira.jboss.org/jira/browse/JBPM-1736 --> + <exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude> </excludes> </configuration> </plugin> @@ -251,9 +253,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> - <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> - <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> @@ -282,9 +281,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> - <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> - <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> @@ -315,9 +311,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> - <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> - <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> @@ -351,9 +344,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> - <!-- https://jira.jboss.org/jira/browse/JBPM-1721 --> - <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> - <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> <!-- https://jira.jboss.org/jira/browse/JBPM-1723 --> <exclude>org/jbpm/perf/PerfWithoutDbTest.java</exclude> <exclude>org/jbpm/perf/StateUpdateTest.java</exclude> Deleted: 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-10-29 00:58:23 UTC (rev 2649) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobLoadSubProcessTest.java 2008-10-29 09:22:50 UTC (rev 2650) @@ -1,149 +0,0 @@ -package org.jbpm.job.executor; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; -import org.jbpm.db.AbstractDbTestCase; -import org.jbpm.graph.def.ActionHandler; -import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.exe.ExecutionContext; -import org.jbpm.graph.exe.ProcessInstance; - -public class JobLoadSubProcessTest extends AbstractDbTestCase -{ - // TODO see JobLoadJoinTest, but instead of the joins, use a process with a sub process - private static Log log = LogFactory.getLog(JobLoadSubProcessTest.class); - - static Set finishedProcesses = Collections.synchronizedSet(new HashSet()); - long start; - - @Override - protected String getJbpmTestConfig() - { - return "org/jbpm/job/executor/loadtests.jbpm.cfg.xml"; - } - - protected void setUp() throws Exception - { - super.setUp(); - start = System.currentTimeMillis(); - } - - private boolean timeIsUp(int maxWait) - { - return System.currentTimeMillis() - start > maxWait; - } - - public void testJobLoadWithJoin() throws Exception - { - int processes = 1; - int maxWait = 20000; - - deployProcesses(); - - getJbpmConfiguration().startJobExecutor(); - - Set expectedProcesses = new HashSet(); - for (int i = 0; i < processes; i++) - { - Integer number = new Integer(i); - expectedProcesses.add(number); - Thread thread = new StartNewExecutionThread(getJbpmConfiguration(), number); - thread.start(); - } - - while (!expectedProcesses.equals(finishedProcesses) && !timeIsUp(maxWait)) - { - Thread.sleep(200); - } - log.info("number of finished processes: " + finishedProcesses); - log.info("number of expected processes: " + expectedProcesses); - assertEquals(expectedProcesses, finishedProcesses); - } - - public void deployProcesses() - { - String subProcess = - "<process-definition name='asyncsub' initial='ssarg'>" + - " <node name='ssarg' async='true'>" + - " <transition to='trv' />" + - " </node>" + - " <end-state name='trv' />" + - " <event type='process-end'>" + - " <action class='"+ProcessFinished.class.getName()+"' />" + - " </event>" + - "</process-definition>"; - - String masterProcess = - "<process-definition name='asyncmaster' initial='yenom'>" + - " <node name='yenom' async='true'>" + - " <transition to='rof' />" + - " </node>" + - " <process-state name='rof'>" + - " <sub-process name='asyncsub'>" + - " <variable name='number' />" + - " </sub-process>" + - " <transition to='vtm' />" + - " </process-state>" + - " <end-state name='vtm' />" + - " <event type='process-end'>" + - " <action class='"+ProcessFinished.class.getName()+"' />" + - " </event>" + - "</process-definition>"; - - JbpmContext jbpmContext = getJbpmConfiguration().createJbpmContext(); - try - { - jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(subProcess)); - jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(masterProcess)); - } - finally - { - jbpmContext.close(); - } - } - - public static class StartNewExecutionThread extends Thread - { - JbpmConfiguration jbpmConfiguration; - Integer number; - - public StartNewExecutionThread(JbpmConfiguration jbpmConfiguration, Integer number) - { - this.jbpmConfiguration = jbpmConfiguration; - this.number = number; - } - - public void run() - { - JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); - try - { - ProcessInstance processInstance = jbpmContext.newProcessInstance("asyncmaster"); - processInstance.getContextInstance().setVariable("number", number); - jbpmContext.save(processInstance); - } - finally - { - jbpmContext.close(); - } - } - } - - public static class ProcessFinished implements ActionHandler - { - private static final long serialVersionUID = 1L; - - public void execute(ExecutionContext executionContext) throws Exception - { - Integer number = (Integer)executionContext.getVariable("number"); - log.info("process " + number + " finished"); - finishedProcesses.add(number); - } - } -}