Issue #64: Fix incorrect next execution time for ranges.

jmrozanec · Mar 5, 2016 · d3cb14e · d3cb14e
1 parent b9b9910
commit d3cb14e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/main/java/com/cronutils/model/time/generator/BetweenFieldValueGenerator.java b/src/main/java/com/cronutils/model/time/generator/BetweenFieldValueGenerator.java
@@ -65,6 +65,9 @@ protected List<Integer> generateCandidatesNotIncludingIntervalExtremes(int start
                 rangestart=expressionStart;
             }
             try {
+                if(rangestart!=start){
+                    values.add(rangestart);
+                }
                 int reference = generateNextValue(rangestart);
                 while(reference<rangeend){
                     values.add(reference);

diff --git a/src/test/java/com/cronutils/model/time/ExecutionTimeQuartzIntegrationTest.java b/src/test/java/com/cronutils/model/time/ExecutionTimeQuartzIntegrationTest.java
@@ -177,6 +177,7 @@ public void testSaturdayExecutionTime(){
         DateTime next = executionTime.nextExecution(now);
         assertNotEquals(last, next);
     }
+
     /**
      * Issue: execution time properly calculated
      */
@@ -189,6 +190,22 @@ public void testWeekdayExecutionTime(){
         DateTime next = executionTime.nextExecution(now);
         assertNotEquals(last, next);
     }
+
+    /**
+     * Issue #64: Incorrect next execution time for ranges
+     */
+    @Test
+    public void testExecutionTimeForRanges(){
+        final CronParser quartzParser = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.QUARTZ));
+        ExecutionTime executionTime = ExecutionTime.forCron(quartzParser.parse("* 10-20 * * * * 2099"));
+        DateTime scanTime = DateTime.parse("2016-02-29T11:00:00.000-06:00");
+        DateTime nextTime = executionTime.nextExecution(scanTime);
+        System.out.println(nextTime);
+        assertNotNull(nextTime);
+        assertEquals(10, nextTime.getMinuteOfHour());
+    }
+
+
     private DateTime truncateToSeconds(DateTime dateTime){
         return new DateTime(
                 dateTime.getYear(),