Harshit & Duck | Upgrading schedule-testing to quartz 2.1.5 and bumpe…

…d the version of motech-schedule-testing to 0.4-SNAPSHOT, so that it does not affect teams who are using quartz 1.8.5.
motech · Jun 21, 2012 · 5c09067 · 5c09067
1 parent 88604a0
commit 5c09067
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ test-output/
 .DS_Store
 motech-delivery-tools/motech-document/velocity.log
 motech-delivery-tools/motech-document/motech_api_doc.pdf
+*.log
diff --git a/motech-delivery-tools/motech-delivery-batch/motech-delivery-batch-replication/pom.xml b/motech-delivery-tools/motech-delivery-batch/motech-delivery-batch-replication/pom.xml
@@ -3,9 +3,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>motech-delivery</artifactId>
-        <groupId>org.motechproject</groupId>
-        <version>0.3-SNAPSHOT</version>
+        <artifactId>motech-delivery-batch</artifactId>
+        <groupId>org.motechproject.batch</groupId>
+        <version>0.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -23,4 +23,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/motech-delivery-tools/motech-schedule-testing/pom.xml b/motech-delivery-tools/motech-schedule-testing/pom.xml
@@ -2,13 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>motech-delivery-tools</artifactId>
         <groupId>org.motechproject</groupId>
         <version>0.3-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
+    <version>0.4-SNAPSHOT</version>
     <artifactId>motech-schedule-testing</artifactId>
 
     <properties>
@@ -60,7 +62,7 @@
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>1.8.5</version>
+            <version>2.1.5</version>
         </dependency>
     </dependencies>
 

diff --git a/...schedule-testing/src/main/java/org/motechproject/delivery/schedule/util/FakeSchedule.java b/...schedule-testing/src/main/java/org/motechproject/delivery/schedule/util/FakeSchedule.java
@@ -10,6 +10,7 @@
 import org.motechproject.scheduletracking.api.service.ScheduleTrackingService;
 import org.quartz.*;
 import org.quartz.impl.calendar.BaseCalendar;
+import org.quartz.spi.OperableTrigger;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
 import java.util.*;
@@ -18,6 +19,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.motechproject.scheduletracking.api.events.constants.EventDataKeys.*;
+import static org.quartz.impl.matchers.GroupMatcher.triggerGroupEquals;
 
 public class FakeSchedule {
     private ScheduleTrackingService trackingService;
@@ -92,9 +94,9 @@ public void assertNoAlerts(String milestoneName, WindowName window) {
     }
 
     private void captureAlertsFor(String externalId, String scheduleName) throws SchedulerException {
-        for (String triggerName : scheduler.getTriggerNames("default")) {
-            Trigger trigger = scheduler.getTrigger(triggerName, "default");
-            JobDetail detail = scheduler.getJobDetail(trigger.getJobName(), "default");
+        for (TriggerKey triggerKey : scheduler.getTriggerKeys(triggerGroupEquals("default"))) {
+            Trigger trigger = scheduler.getTrigger(triggerKey);
+            JobDetail detail = scheduler.getJobDetail(JobKey.jobKey(trigger.getJobKey().getName(), "default"));
 
             JobDataMap dataMap = detail.getJobDataMap();
             if (scheduleName.equals(dataMap.get(SCHEDULE_NAME)) && externalId.equals(dataMap.get(EXTERNAL_ID))) {
@@ -108,7 +110,7 @@ private void captureAlertsFor(String externalId, String scheduleName) throws Sch
 
     private void storeAlertTimes(Trigger trigger, JobDetail detail, LocalDate startDate) {
         LocalDate endDate = startDate.plusYears(2);
-        List times = TriggerUtils.computeFireTimesBetween(trigger, new BaseCalendar(), startDate.toDate(), endDate.toDate());
+        List times = TriggerUtils.computeFireTimesBetween((OperableTrigger) trigger, new BaseCalendar(), startDate.toDate(), endDate.toDate());
 
         String windowName = String.valueOf(detail.getJobDataMap().get(WINDOW_NAME));
         MilestoneAlert milestoneAlert = (MilestoneAlert) detail.getJobDataMap().get(MILESTONE_NAME);