Additional failing test for issue #446

Author: Elena Sacchi

src/test/java/com/cronutils/Issue446Test.java

@@ -7,11 +7,13 @@
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import com.cronutils.model.time.ExecutionTime;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.time.*;
 import java.util.Optional;
 
+import static com.cronutils.model.field.expression.FieldExpression.always;
 import static com.cronutils.model.field.expression.FieldExpression.questionMark;
 import static com.cronutils.model.field.expression.FieldExpressionFactory.every;
 import static com.cronutils.model.field.expression.FieldExpressionFactory.on;
@@ -59,6 +61,107 @@ public static CronBuilder getEveryMonthFromNow(ZonedDateTime now, int every) {
                 .withMonth(every(on(now.getMonthValue()), every));
     }
 
+
+    @Test
+    public void testDaylightSavingOverlapMinuteNextRun() {
+
+
+        LocalDateTime daylightSaving2020 = LocalDateTime.of(2020, 10, 25, 1, 10);
+        Clock clock = Clock.fixed(daylightSaving2020.toInstant(ZoneOffset.ofHours(2)),ZoneId.of("Europe/Rome"));
+        ZonedDateTime daylightSaving2020InLocalTimezone = ZonedDateTime.now(clock);
+        System.out.println("\nnow: " + daylightSaving2020InLocalTimezone);
+        Cron cron = getEvery30Minute(daylightSaving2020InLocalTimezone).instance();
+
+        ZonedDateTime nextRun = nextRun(cron, daylightSaving2020InLocalTimezone); // first run
+        Assert.assertEquals(40, nextRun.getMinute());
+        Assert.assertEquals(1, nextRun.getHour());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(10, nextRun.getMinute());
+        Assert.assertEquals(2, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(2), nextRun.getOffset());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(40, nextRun.getMinute());
+        Assert.assertEquals(2, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(2), nextRun.getOffset());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(10, nextRun.getMinute());
+        Assert.assertEquals(2, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(1), nextRun.getOffset());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(40, nextRun.getMinute());
+        Assert.assertEquals(2, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(1), nextRun.getOffset());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(10, nextRun.getMinute());
+        Assert.assertEquals(3, nextRun.getHour());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(40, nextRun.getMinute());
+        Assert.assertEquals(3, nextRun.getHour());
+
+    }
+
+    @Test
+    @Ignore
+    public void testDaylightSavingOverlapHourNextRun() {
+
+        LocalDateTime startDay = LocalDateTime.of(2020, 10, 24, 1, 0); // Day before Daylight saving
+        Clock clock = Clock.fixed(startDay.toInstant(ZoneOffset.ofHours(2)),ZoneId.of("Europe/Rome"));
+        ZonedDateTime daylightSaving2020InLocalTimezone = ZonedDateTime.now(clock);
+        System.out.println("\nnow: " + daylightSaving2020InLocalTimezone);
+        Cron cron = getEveryHour(daylightSaving2020InLocalTimezone).instance();
+
+        ZonedDateTime nextRun = nextRun(cron, daylightSaving2020InLocalTimezone);
+        Assert.assertEquals(0, nextRun.getMinute());
+        Assert.assertEquals(2, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(2), nextRun.getOffset());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(0, nextRun.getMinute());
+        Assert.assertEquals(3, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(2), nextRun.getOffset());
+
+        startDay = LocalDateTime.of(2020, 10, 25, 1, 0); // Daylight saving
+        clock = Clock.fixed(startDay.toInstant(ZoneOffset.ofHours(2)),ZoneId.of("Europe/Rome"));
+        daylightSaving2020InLocalTimezone = ZonedDateTime.now(clock);
+        System.out.println("\nnow: " + daylightSaving2020InLocalTimezone);
+        cron = getEveryHour(daylightSaving2020InLocalTimezone).instance();
+
+        nextRun = nextRun(cron, daylightSaving2020InLocalTimezone); // first run
+        Assert.assertEquals(0, nextRun.getMinute());
+        Assert.assertEquals(2, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(2), nextRun.getOffset());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(0, nextRun.getMinute());
+        Assert.assertEquals(2, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(1), nextRun.getOffset());
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(0, nextRun.getMinute());
+        Assert.assertEquals(3, nextRun.getHour());
+        Assert.assertEquals(ZoneOffset.ofHours(1), nextRun.getOffset());
+
+    }
+
+
+    public static CronBuilder getEveryHour(ZonedDateTime now) {
+        return CronBuilder.cron(definition)
+                .withMinute(on(now.getMinute()))
+                .withHour(every(on(now.getHour()),1))
+                .withDoW(questionMark())
+                .withDoM(on(now.getDayOfMonth()))
+                .withDoY(questionMark())
+                .withMonth(on(now.getMonthValue()));
+    }
+
+    public static CronBuilder getEvery30Minute(ZonedDateTime now) {
+        return CronBuilder.cron(definition)
+                .withMinute(every(on(now.getMinute()),30))
+                .withHour(always())
+                .withDoW(questionMark())
+                .withDoM(on(now.getDayOfMonth()))
+                .withDoY(questionMark())
+                .withMonth(on(now.getMonthValue()));
+    }
+
+
     private static ZonedDateTime nextRun(Cron cron, ZonedDateTime when) {
         final Optional<ZonedDateTime> next = ExecutionTime.forCron(cron).nextExecution(when);
         if (!next.isPresent()) {