Author: alex.guizar(a)jboss.com Date: 2008-10-16 03:34:54 -0400 (Thu, 16 Oct 2008) New Revision: 2548 Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/mail/TaskMailTest.java jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/svc/ServicesTest.java Log: merged revision 2134 from https://svn.jboss.org/repos/jbpm/jbpm3/trunk/modules/core/src/test/java Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/mail/TaskMailTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/mail/TaskMailTest.java 2008-10-16 07:33:28 UTC (rev 2547) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/mail/TaskMailTest.java 2008-10-16 07:34:54 UTC (rev 2548) @@ -84,7 +84,7 @@ assertTrue(-1!=email.getBody().indexOf("http://localhost:8080/jbpm/home?taskId=0")); } - public static class TestSchedulerService implements SchedulerService, Service, ServiceFactory { + public static class TestSchedulerService implements SchedulerService, ServiceFactory { private static final long serialVersionUID = 1L; List createdTimers = new ArrayList(); @@ -93,11 +93,12 @@ public void createTimer(Timer timer) { createdTimers.add(timer); } - + public void deleteTimer(Timer timer) { + cancelledTimers.add(timer.getName()); + } public void deleteTimersByName(String timerName, Token token) { cancelledTimers.add(timerName); } - public void deleteTimersByProcessInstance(ProcessInstance processInstance) { } public Service openService() { @@ -105,6 +106,7 @@ } public void close() { } + } public void testTaskInstanceReminder() throws Exception { Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2008-10-16 07:33:28 UTC (rev 2547) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2008-10-16 07:34:54 UTC (rev 2548) @@ -59,6 +59,9 @@ public void createTimer(Timer timer) { createdTimers.add(timer); } + public void deleteTimer(Timer timer) { + cancelledTimersByName.add(new Object[]{timer.getName(), timer.getToken()}); + } public void deleteTimersByName(String timerName, Token token) { cancelledTimersByName.add(new Object[]{timerName, token}); } Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/svc/ServicesTest.java =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/svc/ServicesTest.java 2008-10-16 07:33:28 UTC (rev 2547) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/svc/ServicesTest.java 2008-10-16 07:34:54 UTC (rev 2548) @@ -20,6 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jbpm.svc; + import java.security.AccessControlException; import java.security.Permission; import java.util.HashMap; @@ -27,7 +28,6 @@ import junit.framework.TestCase; -import org.hibernate.SessionFactory; import org.jbpm.db.ContextSession; import org.jbpm.db.GraphSession; import org.jbpm.db.JobSession; @@ -160,7 +160,6 @@ public void setLoggingSession(LoggingSession loggingSession) {} public void setJobSession(JobSession jobSession) {} public void setTaskMgmtSession(TaskMgmtSession taskMgmtSession) {} - public void setSessionFactory(SessionFactory sessionFactory) {} }; serviceFactories.put("persistence", new TestGivenServiceFactory(service)); Services services = new Services(serviceFactories); @@ -171,6 +170,7 @@ SchedulerService schedulerService = new SchedulerService() { private static final long serialVersionUID = 1L; public void createTimer(Timer timer) {} + public void deleteTimer(Timer timer) {} public void deleteTimersByName(String timerName, Token token) {} public void deleteTimersByProcessInstance(ProcessInstance processInstance) {} public void close() {}