Author: tom.baeyens(a)jboss.com Date: 2009-11-25 07:40:03 -0500 (Wed, 25 Nov 2009) New Revision: 5892 Added: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java jbpm4/trunk/modules/test-cactus/pom.xml jbpm4/trunk/modules/test-db/pom.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java jbpm4/trunk/qa/build.xml Log: fixing bpmn test suites and updated HistoryActivityInstanceQueryTest to use the simulation clock Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.jbpm.cfg.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -5,6 +5,7 @@ <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.console.cfg.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/jta.testsuite.jbpm.cfg.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -5,6 +5,7 @@ <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.jta.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.mail.templates.examples.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.jbpm.cfg.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.jbpm.cfg.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -5,6 +5,7 @@ <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.spring.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.console.cfg.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -5,6 +5,7 @@ <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.spring.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.console.cfg.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.jbpm.cfg.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.jbpm.cfg.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -5,6 +5,7 @@ <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.console.cfg.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -5,6 +5,7 @@ <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> <import resource="jbpm.mail.templates.examples.xml" /> Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -5,6 +5,7 @@ <import resource="jbpm.default.cfg.xml" /> <import resource="jbpm.tx.hibernate.cfg.xml" /> <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.bpmn.cfg.xml" /> <import resource="jbpm.identity.cfg.xml" /> <import resource="jbpm.businesscalendar.cfg.xml" /> Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/examples/pom.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -42,10 +42,15 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-bpmn</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-test-base</artifactId> <scope>test</scope> </dependency> @@ -130,6 +135,7 @@ <property name="cfg.dest.dir" value="target/test-classes" /> <property name="install.src.dir" value="../distro/src/main/files/install/src" /> <property name="jdbc.properties.dir" value="target/jdbc.properties" /> + <property name="logging" value="none" /> <!-- then the original logging.properties in the resources of this project will be used --> </ant> </tasks> </configuration> Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-11-25 12:40:03 UTC (rev 5892) @@ -27,14 +27,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.Enumeration; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.StringTokenizer; import org.jbpm.api.JbpmException; -import org.jbpm.api.ProcessDefinition; import org.jbpm.api.activity.ActivityBehaviour; import org.jbpm.api.listener.EventListener; import org.jbpm.api.model.Event; @@ -47,9 +44,6 @@ import org.jbpm.pvm.internal.email.impl.MailTemplateRegistry; import org.jbpm.pvm.internal.email.spi.MailProducer; import org.jbpm.pvm.internal.env.EnvironmentImpl; -import org.jbpm.pvm.internal.migration.AbortMigrationHandler; -import org.jbpm.pvm.internal.migration.DefaultMigrationHandler; -import org.jbpm.pvm.internal.migration.MigrationDescriptor; import org.jbpm.pvm.internal.model.ActivityCoordinatesImpl; import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.CompositeElementImpl; @@ -81,8 +75,6 @@ import org.jbpm.pvm.internal.xml.Parser; import org.jbpm.pvm.internal.xml.ProblemImpl; import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * @author Tom Baeyens Modified: jbpm4/trunk/modules/test-cactus/pom.xml =================================================================== --- jbpm4/trunk/modules/test-cactus/pom.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/test-cactus/pom.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -31,6 +31,14 @@ <dependencies> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-bpmn</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-examples</artifactId> <classifier>tests</classifier> </dependency> Added: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java (rev 0) +++ jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-11-25 12:40:03 UTC (rev 5892) @@ -0,0 +1,132 @@ +package org.jbpm.test; + +import junit.framework.Test; +import junit.framework.TestCase; +import org.apache.cactus.ServletTestSuite; + +public class AllIntegrationTests extends TestCase { + + public static Test suite() { + ServletTestSuite suite = new ServletTestSuite(); + suite.addTestSuite(org.jbpm.examples.async.activity.AsyncActivityTest.class); + suite.addTestSuite(org.jbpm.examples.async.fork.AsyncForkTest.class); + suite.addTestSuite(org.jbpm.examples.concurrency.graphbased.ConcurrencyGraphBasedTest.class); + suite.addTestSuite(org.jbpm.examples.custom.CustomTest.class); + suite.addTestSuite(org.jbpm.examples.decision.conditions.DecisionConditionsTest.class); + suite.addTestSuite(org.jbpm.examples.decision.expression.DecisionExpressionTest.class); + suite.addTestSuite(org.jbpm.examples.decision.handler.DecisionHandlerTest.class); + suite.addTestSuite(org.jbpm.examples.end.multiple.EndMultipleTest.class); + suite.addTestSuite(org.jbpm.examples.end.processinstance.EndProcessInstanceTest.class); + suite.addTestSuite(org.jbpm.examples.end.state.EndStateTest.class); + suite.addTestSuite(org.jbpm.examples.eventlistener.EventListenerTest.class); + suite.addTestSuite(org.jbpm.examples.hql.HqlTest.class); + suite.addTestSuite(org.jbpm.examples.java.JavaInstantiateTest.class); + suite.addTestSuite(org.jbpm.examples.mail.inline.InlineMailTest.class); + suite.addTestSuite(org.jbpm.examples.mail.template.TemplateMailTest.class); + suite.addTestSuite(org.jbpm.examples.script.expression.ScriptExpressionTest.class); + suite.addTestSuite(org.jbpm.examples.script.text.ScriptTextTest.class); + suite.addTestSuite(org.jbpm.examples.services.ServicesTest.class); + suite.addTestSuite(org.jbpm.examples.sql.SqlTest.class); + suite.addTestSuite(org.jbpm.examples.state.choice.StateChoiceTest.class); + suite.addTestSuite(org.jbpm.examples.state.sequence.StateSequenceTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.outcomeactivity.SubProcessOutcomeActivityTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.outcomevalue.SubProcessOutcomeValueTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.variables.SubProcessVariablesTest.class); + suite.addTestSuite(org.jbpm.examples.task.assignee.TaskAssigneeTest.class); + suite.addTestSuite(org.jbpm.examples.task.assignmenthandler.TaskAssignmentHandlerTest.class); + suite.addTestSuite(org.jbpm.examples.task.candidates.TaskCandidatesTest.class); + suite.addTestSuite(org.jbpm.examples.task.comments.TaskCommentsTest.class); + suite.addTestSuite(org.jbpm.examples.task.notification.TaskNotificationTest.class); + suite.addTestSuite(org.jbpm.examples.task.reminder.TaskReminderTest.class); + suite.addTestSuite(org.jbpm.examples.task.swimlane.TaskSwimlaneTest.class); + suite.addTestSuite(org.jbpm.examples.task.variables.TaskVariablesTest.class); + suite.addTestSuite(org.jbpm.examples.timer.businesstime.TimerBusinessTimeTest.class); + suite.addTestSuite(org.jbpm.examples.timer.event.TimerEventTest.class); + suite.addTestSuite(org.jbpm.examples.timer.repeat.TimerRepeatTest.class); + suite.addTestSuite(org.jbpm.examples.timer.transition.TimerTransitionTest.class); + suite.addTestSuite(org.jbpm.bpmn.ExclusiveGatewayTest.class); + suite.addTestSuite(org.jbpm.bpmn.ParallelGatewayTest.class); + suite.addTestSuite(org.jbpm.bpmn.ScriptTaskTest.class); + suite.addTestSuite(org.jbpm.bpmn.ServiceTaskTest.class); + suite.addTestSuite(org.jbpm.bpmn.UserTaskTest.class); + suite.addTestSuite(org.jbpm.examples.async.eventlistener.AsyncEventListenerTest.class); + suite.addTestSuite(org.jbpm.examples.goup.concurrency.GroupConcurrencyTest.class); + suite.addTestSuite(org.jbpm.examples.goup.multipleentries.MultipleEntriesTest.class); + suite.addTestSuite(org.jbpm.examples.goup.simple.GroupSimpleTest.class); + suite.addTestSuite(org.jbpm.examples.goup.timer.GroupTimerTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkJoinInSameTransactionTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkToTaskTest.class); + suite.addTestSuite(org.jbpm.test.activities.GroupBasicsTest.class); + suite.addTestSuite(org.jbpm.test.activities.GroupTimersTest.class); + suite.addTestSuite(org.jbpm.test.activities.JoinTest.class); + suite.addTestSuite(org.jbpm.test.activities.StatesJoinEndTest.class); + suite.addTestSuite(org.jbpm.test.activities.StateTest.class); + suite.addTestSuite(org.jbpm.test.activities.SubProcessTest.class); + suite.addTestSuite(org.jbpm.test.activities.TasksJoinEndTest.class); + suite.addTestSuite(org.jbpm.test.activity.custom.CustomConfigurationsTest.class); + suite.addTestSuite(org.jbpm.test.activity.decision.DecisionTest.class); + suite.addTestSuite(org.jbpm.test.activity.group.GroupConcurrencyCombinationTest.class); + suite.addTestSuite(org.jbpm.test.activity.mail.MailTest.class); + suite.addTestSuite(org.jbpm.test.activity.task.TaskAssignmentHandlerExprTest.class); + suite.addTestSuite(org.jbpm.test.activity.task.TaskCandidatesTest.class); + suite.addTestSuite(org.jbpm.test.activity.task.TaskCompletionTest.class); + suite.addTestSuite(org.jbpm.test.activity.task.TaskOutcomesTest.class); + suite.addTestSuite(org.jbpm.test.activity.task.TaskReassignTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncBasicsTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncEndCombinationTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncEventListenerOnEndTest.class); + suite.addTestSuite(org.jbpm.test.auth.UserProvidedAuthenticationTest.class); + suite.addTestSuite(org.jbpm.test.classloading.DelayedInstantiationTest.class); + suite.addTestSuite(org.jbpm.test.deploy.DeploymentResourceTest.class); + suite.addTestSuite(org.jbpm.test.deploy.ImageTest.class); + suite.addTestSuite(org.jbpm.test.deploy.SuspendDeploymentTest.class); + suite.addTestSuite(org.jbpm.test.eventlistener.EventListenerTest.class); + suite.addTestSuite(org.jbpm.test.eventlistener.HqlEventListenerTest.class); + suite.addTestSuite(org.jbpm.test.execution.ConcurrentEndTest.class); + suite.addTestSuite(org.jbpm.test.execution.ExecutionEagerLoadingTest.class); + suite.addTestSuite(org.jbpm.test.execution.ExecutionExpressionTest.class); + suite.addTestSuite(org.jbpm.test.execution.ExecutionQueryTest.class); + suite.addTestSuite(org.jbpm.test.execution.FindExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.SignalExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.StartExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.SystemVariablesTest.class); + suite.addTestSuite(org.jbpm.test.history.AvgDurationTest.class); + suite.addTestSuite(org.jbpm.test.history.ChoiceDistributionTest.class); + suite.addTestSuite(org.jbpm.test.history.EndProcessInstanceTest.class); + suite.addTestSuite(org.jbpm.test.history.HistoryTaskAssigneeTest.class); + suite.addTestSuite(org.jbpm.test.history.ProcessInstanceHistoryTest.class); + suite.addTestSuite(org.jbpm.test.identity.IdentityTest.class); + suite.addTestSuite(org.jbpm.test.migration.InstanceMigratorTest.class); + suite.addTestSuite(org.jbpm.test.process.ActivityCoordinatesTest.class); + suite.addTestSuite(org.jbpm.test.process.DeploymentResourcesTest.class); + suite.addTestSuite(org.jbpm.test.process.DescriptionTest.class); + suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionStartFormTest.class); + suite.addTestSuite(org.jbpm.test.process.RepositoryServiceTest.class); + suite.addTestSuite(org.jbpm.test.query.DeploymentQueryTest.class); + suite.addTestSuite(org.jbpm.test.query.HistoryActivityInstanceQueryTest.class); + suite.addTestSuite(org.jbpm.test.query.HistoryDetailQueryTest.class); + suite.addTestSuite(org.jbpm.test.query.HistoryProcessInstanceQueryTest.class); + suite.addTestSuite(org.jbpm.test.query.HistoryTaskQueryTest.class); + suite.addTestSuite(org.jbpm.test.query.JobQueryTest.class); + suite.addTestSuite(org.jbpm.test.query.ProcessDefinitionQueryTest.class); + suite.addTestSuite(org.jbpm.test.query.QueryTest.class); + suite.addTestSuite(org.jbpm.test.query.TaskQueryTest.class); + suite.addTestSuite(org.jbpm.test.task.SubTaskTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskCommentsTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskCreateUpdateDeleteTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskListTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskParticipationsTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskPropertiesTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryCandidatesTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryProcessTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskVariablesTest.class); + suite.addTestSuite(org.jbpm.test.timer.TaskTimerTaskTest.class); + suite.addTestSuite(org.jbpm.test.timer.TimerTest.class); + suite.addTestSuite(org.jbpm.test.usertx.UserTransactionTest.class); + suite.addTestSuite(org.jbpm.test.variables.BasicVariablesTest.class); + suite.addTestSuite(org.jbpm.test.variables.VariableBasicTypesTest.class); + suite.addTestSuite(org.jbpm.test.variables.VariableExpressionTest.class); + return suite; + } +} Property changes on: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/test-db/pom.xml =================================================================== --- jbpm4/trunk/modules/test-db/pom.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/test-db/pom.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -40,12 +40,12 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-bpmn</artifactId> - <scope>runtime</scope> + <scope>test</scope> </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/query/HistoryActivityInstanceQueryTest.java 2009-11-25 12:40:03 UTC (rev 5892) @@ -32,6 +32,7 @@ import org.jbpm.api.ProcessInstance; import org.jbpm.api.history.HistoryActivityInstance; import org.jbpm.api.history.HistoryActivityInstanceQuery; +import org.jbpm.pvm.internal.util.Clock; import org.jbpm.test.JbpmTestCase; import org.jbpm.test.assertion.QueryAssertions; @@ -40,6 +41,11 @@ * @author Tom Baeyens */ public class HistoryActivityInstanceQueryTest extends JbpmTestCase { + + protected void tearDown() throws Exception { + super.tearDown(); + Clock.setCurrentTime(null); + } public void testSimpleQuery() { deployStartAndSignalTestProcesses(); @@ -100,15 +106,35 @@ // Currently only verifies the size of the result set public void testQueryByStartedAfter() { - Date timeStamp = new Date(); - deployStartAndSignalTestProcesses(); + deployTestProcess(); + + // start 8 processes (18 activity instances) on simulated time 3000000 + Clock.setCurrentTime(new Date(3000000)); + generateHistoryForTestProcess(); + generateHistoryForTestProcess(); + + // start another 4 processes (9 activity instances) on simulated time 3000200 + Clock.setCurrentTime(new Date(3000200)); + generateHistoryForTestProcess(); + + Date timeStamp = new Date(3000100); assertEquals(9, historyService.createHistoryActivityInstanceQuery().startedAfter(timeStamp).list().size()); } // Currently only verifies the size of the result set public void testQueryByStartedBefore() { - deployStartAndSignalTestProcesses(); - Date timeStamp = new Date(); + deployTestProcess(); + + // start 4 processes (9 activity instances) on simulated time 3000000 + Clock.setCurrentTime(new Date(3000000)); + generateHistoryForTestProcess(); + + // start another 8 processes (18 activity instances) on simulated time 3000200 + Clock.setCurrentTime(new Date(3000200)); + generateHistoryForTestProcess(); + generateHistoryForTestProcess(); + + Date timeStamp = new Date(3000100); assertEquals(9, historyService.createHistoryActivityInstanceQuery().startedBefore(timeStamp).list().size()); } Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-11-25 09:14:39 UTC (rev 5891) +++ jbpm4/trunk/qa/build.xml 2009-11-25 12:40:03 UTC (rev 5892) @@ -50,8 +50,7 @@ <!-- DB SETUP --> <target name="testsuite.db.setup" depends="reinstall.jbpm"> - <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema"> - </ant> + <ant antfile="${jbpm.home}/install/build.xml" target="drop.jbpm.schema" /> <ant antfile="${jbpm.home}/install/build.xml" target="create.jbpm.schema" /> </target>