You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/07/20 10:12:08 UTC
svn commit: r1753479 -
/sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java
Author: cziegeler
Date: Wed Jul 20 10:12:08 2016
New Revision: 1753479
URL: http://svn.apache.org/viewvc?rev=1753479&view=rev
Log:
Fix timing related behaviour in tests by scheduling a job in the future (instead of now)
Modified:
sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java
Modified: sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java?rev=1753479&r1=1753478&r2=1753479&view=diff
==============================================================================
--- sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java (original)
+++ sling/trunk/bundles/commons/scheduler/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java Wed Jul 20 10:12:08 2016
@@ -264,9 +264,10 @@ public class QuartzSchedulerTest {
@Test
public void testThreadPools() throws SchedulerException {
- quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.NOW().name("j1").threadPoolName("tp1"));
- quartzScheduler.schedule(1L, 2L, new Thread(), quartzScheduler.NOW().name("j2").threadPoolName("tp2"));
- quartzScheduler.schedule(1L, 2L, new Thread(), quartzScheduler.NOW().name("j3").threadPoolName("allowed"));
+ final Date future = new Date(System.currentTimeMillis() + 1000 * 60 * 60);
+ quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.AT(future).name("j1").threadPoolName("tp1"));
+ quartzScheduler.schedule(1L, 2L, new Thread(), quartzScheduler.AT(future).name("j2").threadPoolName("tp2"));
+ quartzScheduler.schedule(1L, 2L, new Thread(), quartzScheduler.AT(future).name("j3").threadPoolName("allowed"));
assertNull(proxies.get("tp1"));
assertNull(proxies.get("tp2"));
@@ -279,21 +280,30 @@ public class QuartzSchedulerTest {
@Test
public void testNameAcrossPools() throws SchedulerException {
- quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.NOW().name("j1").threadPoolName("tp1"));
+ final Date future = new Date(System.currentTimeMillis() + 1000 * 60 * 60);
+ quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.AT(future).name("j1").threadPoolName("tp1"));
assertNull(proxies.get("tp1"));
assertTrue(proxies.get("testName").getScheduler().checkExists(JobKey.jobKey("j1")));
+ quartzScheduler.unschedule(1L, "j1");
+ assertFalse(proxies.get("testName").getScheduler().checkExists(JobKey.jobKey("j1")));
- quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.NOW().name("j1").threadPoolName("allowed"));
+ quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.AT(future).name("j1").threadPoolName("allowed"));
assertFalse(proxies.get("testName").getScheduler().checkExists(JobKey.jobKey("j1")));
assertTrue(proxies.get("allowed").getScheduler().checkExists(JobKey.jobKey("j1")));
+ quartzScheduler.unschedule(1L, "j1");
+ assertFalse(proxies.get("allowed").getScheduler().checkExists(JobKey.jobKey("j1")));
- quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.NOW().name("j1"));
+ quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.AT(future).name("j1"));
assertTrue(proxies.get("testName").getScheduler().checkExists(JobKey.jobKey("j1")));
assertFalse(proxies.get("allowed").getScheduler().checkExists(JobKey.jobKey("j1")));
+ quartzScheduler.unschedule(1L, "j1");
+ assertFalse(proxies.get("testName").getScheduler().checkExists(JobKey.jobKey("j1")));
- quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.NOW().name("j1").threadPoolName("tp1"));
+ quartzScheduler.schedule(1L, 1L, new Thread(), quartzScheduler.AT(future).name("j1").threadPoolName("tp1"));
assertNull(proxies.get("tp1"));
assertTrue(proxies.get("testName").getScheduler().checkExists(JobKey.jobKey("j1")));
+ quartzScheduler.unschedule(1L, "j1");
+ assertFalse(proxies.get("testName").getScheduler().checkExists(JobKey.jobKey("j1")));
}
@After