[jbpm-commits] JBoss JBPM SVN: r4987 - in jbpm4/trunk: modules/examples/src/test/java and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Jun 4 07:04:50 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-06-04 07:04:49 -0400 (Thu, 04 Jun 2009)
New Revision: 4987
Removed:
jbpm4/trunk/modules/examples/src/test/java/reporting/
Modified:
jbpm4/trunk/modules/examples/.classpath
jbpm4/trunk/modules/examples/.project
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml
jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
Log:
JBPM-2147 fixing the integration tests
Modified: jbpm4/trunk/modules/examples/.classpath
===================================================================
--- jbpm4/trunk/modules/examples/.classpath 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/examples/.classpath 2009-06-04 11:04:49 UTC (rev 4987)
@@ -4,5 +4,5 @@
<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/test-classes"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: jbpm4/trunk/modules/examples/.project
===================================================================
--- jbpm4/trunk/modules/examples/.project 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/examples/.project 2009-06-04 11:04:49 UTC (rev 4987)
@@ -10,6 +10,11 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-06-04 11:04:49 UTC (rev 4987)
@@ -74,21 +74,6 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <failIfNoTests>false</failIfNoTests>
- <trimStackTrace>false</trimStackTrace>
- <excludes>
- <exclude>reporting/SQLStmtTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<!-- -Ddatabase= -->
@@ -200,14 +185,13 @@
<trimStackTrace>false</trimStackTrace>
<excludes>
<!-- https://jira.jboss.org/jira/browse/JBPM-2147 -->
- <!-- https://jira.jboss.org/jira/browse/JBPM-2200 -->
- <exclude>reporting/SQLStmtTest.java</exclude>
+ <!-- https://jira.jboss.org/jira/browse/JBPM-2200
<exclude>org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java</exclude>
- <exclude>org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java</exclude>
<exclude>org/jbpm/examples/task/candidates/TaskCandidatesTest.java</exclude>
<exclude>org/jbpm/examples/mail/template/TemplateMailTest.java</exclude>
<exclude>org/jbpm/examples/mail/inline/InlineMailTest.java</exclude>
<exclude>org/jbpm/examples/eventlistener/EventListenerTest.java</exclude>
+ -->
</excludes>
</configuration>
</plugin>
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/EventListenerTest.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -27,8 +27,6 @@
}
public void testEventListener() {
- LogListener.logs = new ArrayList<String>();
-
ProcessInstance processInstance = executionService.startProcessInstanceByKey("EventListener");
Execution execution = processInstance.findActiveExecutionIn("wait");
@@ -38,9 +36,10 @@
expectedLogs.add("event(start) on process(EventListener)");
expectedLogs.add("event(start) on activity(wait)");
expectedLogs.add("event(end) on activity(wait)");
- expectedLogs.add("event(take) on (wait)-->(end)");
- expectedLogs.add("event(end) on process(EventListener)");
+ expectedLogs.add("event(take) on (wait)-->(park)");
- assertEquals(expectedLogs, LogListener.logs);
+ List<String> logs = (List<String>) executionService.getVariable(processInstance.getId(), "logs");
+
+ assertEquals(expectedLogs, logs);
}
}
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/eventlistener/LogListener.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -1,5 +1,6 @@
package org.jbpm.examples.eventlistener;
+import java.util.ArrayList;
import java.util.List;
import org.jbpm.api.listener.EventListener;
@@ -10,9 +11,14 @@
private static final long serialVersionUID = 1L;
- public static List<String> logs; // initialization done in test method
-
public void notify(EventListenerExecution execution) {
+ List<String> logs = (List<String>) execution.getVariable("logs");
+ if (logs==null) {
+ logs = new ArrayList<String>();
+ execution.setVariable("logs", logs);
+ }
logs.add(execution.getEvent()+" on "+execution.getEventSource());
+
+ execution.setVariable("logs", logs);
}
}
Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/eventlistener/process.jpdl.xml 2009-06-04 11:04:49 UTC (rev 4987)
@@ -15,20 +15,18 @@
<transition to="wait"/>
</start>
- <state g="96,16,104,52" name="wait">
+ <state name="wait" g="96,16,104,52">
<on event="start">
<event-listener class="org.jbpm.examples.eventlistener.LogListener"/>
</on>
<on event="end">
<event-listener class="org.jbpm.examples.eventlistener.LogListener"/>
</on>
-
- <transition to="end">
+ <transition to="park">
<event-listener class="org.jbpm.examples.eventlistener.LogListener"/>
</transition>
-
</state>
- <end g="231,19,80,52" name="end"/>
+ <state name="park" g="231,19,80,52"/>
</process>
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressTemplate.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressTemplate.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AddressTemplate.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -21,13 +21,17 @@
*/
package org.jbpm.pvm.internal.email.impl;
+import java.io.Serializable;
+
/**
* Template for email addresses.
*
* @author Alejandro Guizar
*/
-public class AddressTemplate {
+public class AddressTemplate implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private String addresses;
private String users;
private String groups;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/AttachmentTemplate.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -21,55 +21,59 @@
*/
package org.jbpm.pvm.internal.email.impl;
+import java.io.Serializable;
+
/**
* @author Alejandro Guizar
*/
-public class AttachmentTemplate {
+public class AttachmentTemplate implements Serializable {
- private String name;
- private String description;
- private String url;
- private String resource;
- private String file;
+ private static final long serialVersionUID = 1L;
- public String getName() {
- return name;
- }
+ private String name;
+ private String description;
+ private String url;
+ private String resource;
+ private String file;
- public void setName(String name) {
- this.name = name;
- }
+ public String getName() {
+ return name;
+ }
- public String getDescription() {
- return description;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
+ public String getDescription() {
+ return description;
+ }
- public String getUrl() {
- return url;
- }
+ public void setDescription(String description) {
+ this.description = description;
+ }
- public void setUrl(String url) {
- this.url = url;
- }
+ public String getUrl() {
+ return url;
+ }
- public String getResource() {
- return resource;
- }
+ public void setUrl(String url) {
+ this.url = url;
+ }
- public void setResource(String resource) {
- this.resource = resource;
- }
+ public String getResource() {
+ return resource;
+ }
- public String getFile() {
- return file;
- }
+ public void setResource(String resource) {
+ this.resource = resource;
+ }
- public void setFile(String file) {
- this.file = file;
- }
+ public String getFile() {
+ return file;
+ }
+ public void setFile(String file) {
+ this.file = file;
+ }
+
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailProducerImpl.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -22,6 +22,7 @@
package org.jbpm.pvm.internal.email.impl;
import java.io.File;
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
@@ -59,8 +60,10 @@
*
* @author Alejandro Guizar
*/
-public class MailProducerImpl implements MailProducer {
+public class MailProducerImpl implements MailProducer, Serializable {
+ private static final long serialVersionUID = 1L;
+
private MailTemplate template;
public MailTemplate getTemplate() {
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplate.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.email.impl;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,8 +34,10 @@
*
* @author Alejandro Guizar
*/
-public class MailTemplate {
+public class MailTemplate implements Serializable {
+ private static final long serialVersionUID = 1L;
+
private String language;
private AddressTemplate from;
private Map<RecipientType, AddressTemplate> recipientTemplates =
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/TaskServiceImpl.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -96,8 +96,7 @@
.list();
}
- public List<Task> findGroupTasks(String userId)
- {
+ public List<Task> findGroupTasks(String userId) {
return createTaskQuery()
.candidate(userId)
.orderDesc(TaskQuery.PROPERTY_PRIORITY)
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskQueryImpl.java 2009-06-04 11:04:49 UTC (rev 4987)
@@ -46,8 +46,7 @@
private static Log log = Log.getLog(TaskQueryImpl.class.getName());
- private static final String UNASSIGNED = "unassigned";
-
+ protected boolean unassigned = false;
protected String assignee = null;
protected String candidate = null;
@@ -71,12 +70,14 @@
throw new JbpmException("assignee(...) cannot be combined with candidate(...) in one query");
}
this.candidate = userId;
- this.assignee = UNASSIGNED;
+ this.assignee = null;
+ this.unassigned = true;
return this;
}
public TaskQuery unassigned() {
- this.assignee = UNASSIGNED;
+ this.assignee = null;
+ this.unassigned = true;
return this;
}
@@ -96,7 +97,7 @@
}
protected void applyParameters(Query query) {
- if ((assignee != UNASSIGNED) && (assignee != null)) {
+ if (! unassigned) {
log.debug("setting parameter assignee: "+assignee);
query.setString("assignee", assignee);
}
@@ -145,7 +146,7 @@
appendWhereClause("task.state != '"+Task.STATE_SUSPENDED+"' ", hql);
- if (assignee == UNASSIGNED) {
+ if (unassigned) {
appendWhereClause("task.assignee is null ", hql);
} else if (assignee != null) {
appendWhereClause("task.assignee = :assignee ", hql);
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch06-Jpdl.xml 2009-06-04 11:04:49 UTC (rev 4987)
@@ -2470,34 +2470,39 @@
</on></emphasis>
- <start>
- <transition to="wait" name=""/>
+ <start >
+ <transition to="wait"/>
</start>
- <state name="wait">
+ <state name="wait" >
<emphasis role="bold"><on event="start">
<event-listener class="org.jbpm.examples.eventlistener.LogListener"/>
</on>
<on event="end">
<event-listener class="org.jbpm.examples.eventlistener.LogListener"/>
</on></emphasis>
-
- <transition to="end" name="">
- <event-listener class="org.jbpm.examples.eventlistener.LogListener"/>
+ <transition to="park">
+ <emphasis role="bold"><event-listener class="org.jbpm.examples.eventlistener.LogListener"/></emphasis>
</transition>
</state>
- <end name="end"/>
+ <state name="park" />
</process></programlisting>
<para><literal>LogListener</literal> will maintain a list of logs in a static member
field:</para>
<programlisting>public class <emphasis role="bold">LogListener</emphasis> implements EventListener {
-
- public static List<String> logs; // initialization done in test method
public void notify(EventListenerExecution execution) {
+ List<String> logs = (List<String>) execution.getVariable("logs");
+ if (logs==null) {
+ logs = new ArrayList<String>();
+ execution.setVariable("logs", logs);
+ }
+
logs.add(execution.getEvent()+" on "+execution.getEventSource());
+
+ execution.setVariable("logs", logs);
}
}</programlisting>
<para>Next, we start a new process instance.</para>
@@ -2510,8 +2515,7 @@
<programlisting>[event(start) on process(EventListener),
event(start) on activity(wait),
event(end) on activity(wait),
- event(take) on (wait)-->(end),
- event(end) on process(EventListener)]</programlisting>
+ event(take) on (wait)-->(park)]</programlisting>
</section>
<section id="asynchronouscontinuations">
Modified: jbpm4/trunk/qa/hudson-jbpm4-jboss.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-06-04 02:26:17 UTC (rev 4986)
+++ jbpm4/trunk/qa/hudson-jbpm4-jboss.bat 2009-06-04 11:04:49 UTC (rev 4987)
@@ -10,3 +10,5 @@
cmd /C mvn -U -Djboss.bind.address=localhost test
cmd /C ant -f qa/build.xml integration.testrun.teardown
+
+echo
More information about the jbpm-commits
mailing list