From d0a5b96147c1e722ff248c56e033e9ec3929c280 Mon Sep 17 00:00:00 2001
From: jbarrez <jbarrez@51b7ce9a-3489-0410-86de-dc9a27cf12c7>
Date: Thu, 21 Oct 2010 14:57:45 +0000
Subject: [PATCH] Added example with timer to explorer processes

---
 distro/src/setup/build.xml                         |  1 +
 .../bpmn/event/timer/BoundaryTimerEventTest.java   | 14 +++++---------
 ...ntTest.testInterruptingTimerDuration.bpmn20.xml | 12 ++++++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/distro/src/setup/build.xml b/distro/src/setup/build.xml
index efd02adaa1..56ef3725a2 100644
--- a/distro/src/setup/build.xml
+++ b/distro/src/setup/build.xml
@@ -347,6 +347,7 @@ JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787
         <include name="org/activiti/examples/taskforms/request.form"/>
         <include name="org/activiti/examples/taskforms/approve.form"/>
         <include name="org/activiti/examples/taskforms/adjustRequest.form"/>
+      	<include name="org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.testInterruptingTimerDuration.bpmn20.xml" />
       </fileset>
     </zip>
     <taskdef name="deploy-bar" classname="org.activiti.engine.impl.ant.DeployBarTask">
diff --git a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.java b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.java
index 9033d99206..356b0122f1 100644
--- a/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.java
@@ -12,10 +12,8 @@
  */
 package org.activiti.examples.bpmn.event.timer;
 
-import java.util.Date;
-
 import org.activiti.engine.impl.test.ActivitiInternalTestCase;
-import org.activiti.engine.impl.util.ClockUtil;
+import org.activiti.engine.runtime.Job;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.test.Deployment;
@@ -28,18 +26,16 @@ public class BoundaryTimerEventTest extends ActivitiInternalTestCase {
   @Deployment
   public void testInterruptingTimerDuration() {
     
-    Date startTime = new Date();
-
     // Start process instance
-    ProcessInstance pi = runtimeService.startProcessInstanceByKey("interruptingBoundaryTimer");
+    ProcessInstance pi = runtimeService.startProcessInstanceByKey("escalationExample");
 
     // There should be one task, with a timer : first line support
     Task task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult();
     assertEquals("First line support", task.getName());
 
-    // Set clock to the future such that the timer can fire
-    ClockUtil.setCurrentTime(new Date(startTime.getTime() + (5 * 60 * 60 * 1000)));
-    waitForJobExecutorToProcessAllJobs(10000L, 250L);
+    // Manually execute the job
+    Job timer = managementService.createJobQuery().singleResult();
+    managementService.executeJob(timer.getId());
 
     // The timer has fired, and the second task (secondlinesupport) now exists
     task = taskService.createTaskQuery().processInstanceId(pi.getId()).singleResult();
diff --git a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.testInterruptingTimerDuration.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.testInterruptingTimerDuration.bpmn20.xml
index 98054c5a97..a7bd2a7139 100644
--- a/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.testInterruptingTimerDuration.bpmn20.xml
+++ b/modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/event/timer/BoundaryTimerEventTest.testInterruptingTimerDuration.bpmn20.xml
@@ -5,13 +5,15 @@
 	xmlns:activiti="http://activiti.org/bpmn-extensions" 
 	targetNamespace="http://www.activiti.org/bpmn2.0">
 
-	<process id="interruptingBoundaryTimer">
+	<process id="escalationExample" name="Timer escalation example">
 
 		<startEvent id="theStart" />
 
 		<sequenceFlow id="flow1" sourceRef="theStart" targetRef="firstLineSupport" />
 
-		<userTask id="firstLineSupport" name="First line support" />
+		<userTask id="firstLineSupport" name="First line support" activiti:assignee="kermit">
+		  <documentation>Fix issue raised by customer</documentation>
+		</userTask>
 
 		<sequenceFlow id="flow2" sourceRef="firstLineSupport" targetRef="normalEnd" />
 
@@ -19,13 +21,15 @@
 
 		<boundaryEvent id="escalationTimer" cancelActivity="true" attachedToRef="firstLineSupport">
 			<timerEventDefinition>
-				<timeDuration>PT4H</timeDuration>
+				<timeDuration>PT5M</timeDuration>
 			</timerEventDefinition>
 		</boundaryEvent>
 
 		<sequenceFlow id="flow3" sourceRef="escalationTimer" targetRef="secondLineSupport" />
 
-		<userTask id="secondLineSupport" name="Second line support" />
+		<userTask id="secondLineSupport" name="Second line support" activiti:candidateGroups="management">
+		  <documentation>Escalation: issue was not fixed in time by first level support</documentation>
+		</userTask>
 
 		<sequenceFlow id="flow4" sourceRef="secondLineSupport" targetRef="escalatedEnd" />
 
-- 
GitLab