[jbpm-commits] JBoss JBPM SVN: r4884 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/async and 9 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-05-25 06:08:37 -0400 (Mon, 25 May 2009) New Revision: 4884 Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.properties jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/async/ jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/async/eventlistener/ Removed: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/eventlistener/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/eventlistener/ Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java Log: JBPM-2256 async moved event listeners to dev guide Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java 2009-05-25 09:14:46 UTC (rev 4883) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/JobQuery.java 2009-05-25 10:08:37 UTC (rev 4884) @@ -36,7 +36,7 @@ JobQuery processInstanceId(String processInstanceId); - JobQuery exception(); + JobQuery exception(boolean hasException); JobQuery orderAsc(String property); JobQuery orderDesc(String property); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-05-25 09:14:46 UTC (rev 4883) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/query/JobQueryImpl.java 2009-05-25 10:08:37 UTC (rev 4884) @@ -42,7 +42,7 @@ protected boolean messagesOnly = false; protected boolean timersOnly = false; protected String processInstanceId = null; - protected boolean exception = false; + protected Boolean exception; public JobQueryImpl(CommandService commandService) { super(commandService); @@ -65,10 +65,12 @@ appendWhereClause("j.processInstance.id = '"+processInstanceId+"' ", hql); } - if (exception) { - appendWhereClause("j.exception is not null ", hql); - } else { - appendWhereClause("j.exception is null ", hql); + if (exception!=null) { + if (exception) { + appendWhereClause("j.exception is not null ", hql); + } else { + appendWhereClause("j.exception is null ", hql); + } } return hql.toString(); @@ -95,8 +97,8 @@ return this; } - public JobQuery exception() { - this.exception = true; + public JobQuery exception(boolean hasException) { + this.exception = hasException; return this; } Copied: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener (from rev 4879, jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/eventlistener) Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java 2009-05-24 19:24:23 UTC (rev 4879) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/examples/async/eventlistener/AsyncEventListenerTest.java 2009-05-25 10:08:37 UTC (rev 4884) @@ -21,40 +21,26 @@ */ package org.jbpm.examples.async.eventlistener; -import java.io.IOException; - -import javax.mail.MessagingException; - import org.jbpm.api.ProcessInstance; import org.jbpm.api.job.Job; import org.jbpm.test.JbpmTestCase; -import org.subethamail.wiser.Wiser; - /** * @author Tom Baeyens */ public class AsyncEventListenerTest extends JbpmTestCase { long deploymentDbid; - Wiser wiser = null; protected void setUp() throws Exception { super.setUp(); deploymentDbid = repositoryService.createDeployment() - .addResourceFromClasspath("org/jbpm/examples/async/eventlistener/process.jpdl.xml") - .deploy(); - - // start mail server - wiser = new Wiser(); - wiser.setPort(2525); - wiser.start(); + .addResourceFromClasspath("org/jbpm/examples/async/eventlistener/process.jpdl.xml") + .deploy(); } protected void tearDown() throws Exception { - wiser.stop(); - repositoryService.deleteDeploymentCascade(deploymentDbid); super.tearDown(); @@ -64,13 +50,17 @@ ProcessInstance processInstance = executionService.startProcessInstanceByKey("AsyncEventListener"); String processInstanceId = processInstance.getId(); - assertEquals(0, wiser.getMessages().size()); - Job job = managementService.createJobQuery() .processInstanceId(processInstanceId) .uniqueResult(); managementService.executeJob(job.getDbid()); - - assertEquals(1, wiser.getMessages().size()); + + job = managementService.createJobQuery() + .processInstanceId(processInstanceId) + .uniqueResult(); + + assertNotNull(job); + assertTextPresent("could not send email", job.getException()); + assertEquals(2, job.getRetries()); } } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java 2009-05-25 09:14:46 UTC (rev 4883) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/mgmt/JobQueryTest.java 2009-05-25 10:08:37 UTC (rev 4884) @@ -92,7 +92,7 @@ managementService.executeJob(messages.get(0).getDbid()); List<Job> errorJobs = managementService.createJobQuery() - .exception() + .exception(true) .list(); assertEquals(1, errorJobs.size()); @@ -101,6 +101,7 @@ messages = managementService.createJobQuery() .messages() + .exception(false) .list(); assertEquals(2, messages.size()); Added: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.properties =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.properties (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.properties 2009-05-25 10:08:37 UTC (rev 4884) @@ -0,0 +1,3 @@ +mail.smtp.host localhost +mail.smtp.port 2525 +mail.from noreply(a)jbpm.org \ No newline at end of file Property changes on: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.mail.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/trunk/modules/test-db/src/test/resources/org/jbpm/examples/async/eventlistener (from rev 4879, jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/async/eventlistener)