commit 39fc24367b49ef5791713eeeb88d2e1a83b85023
author Carsten Ziegeler <cziegeler@apache.org> Wed Jul 20 10:12:08 2016 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Wed Jul 20 10:12:08 2016 +0000
tree 3e98dccee24b91a805fb5c8d25ef02bcb4cfd850
parent 0276582ff50d67d2c4a682a81f72d6908348b5ca

Fix timing related behaviour in tests by scheduling a job in the future (instead of now)

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1753479 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java

diff --git a/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java b/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java
index b674dc2..e05e5ec 100644
--- a/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java
+++ b/src/test/java/org/apache/sling/commons/scheduler/impl/QuartzSchedulerTest.java
@@ -264,9 +264,10 @@
 
     @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 @@
 
     @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.schedule(1L, 1L, new Thread(), quartzScheduler.NOW().name("j1"));
-        assertTrue(proxies.get("testName").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").threadPoolName("tp1"));
+        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.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