From 716da897278c13abd6a2ff0cb188f69d26cd7410 Mon Sep 17 00:00:00 2001
From: Andreas Schrell <andreas.schrell@set.de>
Date: Wed, 29 Jan 2020 16:19:46 +0100
Subject: [PATCH] Reset hours on skip of day or month

---
 .../src/main/java/fc/cron/CronExpression.java |  8 +--
 .../test/java/fc/cron/CronExpressionTest.java | 63 +++++++++++++++++++
 2 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/java8/src/main/java/fc/cron/CronExpression.java b/java8/src/main/java/fc/cron/CronExpression.java
index 19da54a..9ca98c4 100644
--- a/java8/src/main/java/fc/cron/CronExpression.java
+++ b/java8/src/main/java/fc/cron/CronExpression.java
@@ -191,12 +191,12 @@ public class CronExpression {
 
             @Override
             ZonedDateTime setValue(ZonedDateTime dateTime, int value) {
-                return dateTime.withDayOfMonth(value).withMinute(0).withSecond(0).withNano(0);
+                return dateTime.withDayOfMonth(value).withHour(0).withMinute(0).withSecond(0).withNano(0);
             }
 
             @Override
             ZonedDateTime overflow(ZonedDateTime dateTime) {
-                return dateTime.plusMonths(1).withDayOfMonth(0).withMinute(0).withSecond(0).withNano(0);
+                return dateTime.plusMonths(1).withDayOfMonth(0).withHour(0).withMinute(0).withSecond(0).withNano(0);
             }
         },
         MONTH(1, 12,
@@ -208,12 +208,12 @@ public class CronExpression {
 
             @Override
             ZonedDateTime setValue(ZonedDateTime dateTime, int value) {
-                return dateTime.withMonth(value).withDayOfMonth(1).withMinute(0).withSecond(0).withNano(0);
+                return dateTime.withMonth(value).withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0).withNano(0);
             }
 
             @Override
             ZonedDateTime overflow(ZonedDateTime dateTime) {
-                return dateTime.plusYears(1).withMonth(1).withDayOfMonth(1).withMinute(0).withSecond(0).withNano(0);
+                return dateTime.plusYears(1).withMonth(1).withHour(0).withDayOfMonth(1).withMinute(0).withSecond(0).withNano(0);
             }
         },
         DAY_OF_WEEK(1, 7, Arrays.asList("MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN")) {
diff --git a/java8/src/test/java/fc/cron/CronExpressionTest.java b/java8/src/test/java/fc/cron/CronExpressionTest.java
index 7841d02..67e83bf 100644
--- a/java8/src/test/java/fc/cron/CronExpressionTest.java
+++ b/java8/src/test/java/fc/cron/CronExpressionTest.java
@@ -823,4 +823,67 @@ public class CronExpressionTest {
         ZonedDateTime expected = ZonedDateTime.of(2016, 2, 29, 0, 0, 0, 0, zoneId);
         assertTrue(CronExpression.createWithoutSeconds("* * 29 2 *").nextTimeAfter(after).equals(expected));
     }
+
+    @Test
+    public void testTriggerProblemSameMonth() {
+        assertEquals(ZonedDateTime.parse("2020-01-02T00:50:00Z"),
+            new CronExpression("00 50 * 1-8 1 *")
+                .nextTimeAfter(ZonedDateTime.parse("2020-01-01T23:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextMonth() {
+        assertEquals(ZonedDateTime.parse("2020-02-01T00:50:00Z"),
+            new CronExpression("00 50 * 1-8 2 *")
+                .nextTimeAfter(ZonedDateTime.parse("2020-01-31T23:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextYear() {
+        assertEquals(ZonedDateTime.parse("2020-01-01T00:50:00Z"),
+            new CronExpression("00 50 * 1-8 1 *")
+                .nextTimeAfter(ZonedDateTime.parse("2019-12-31T23:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextMonthMonthAst() {
+        assertEquals(ZonedDateTime.parse("2020-02-01T00:50:00Z"),
+            new CronExpression("00 50 * 1-8 * *")
+                .nextTimeAfter(ZonedDateTime.parse("2020-01-31T23:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextYearMonthAst() {
+        assertEquals(ZonedDateTime.parse("2020-01-01T00:50:00Z"),
+            new CronExpression("00 50 * 1-8 * *")
+                .nextTimeAfter(ZonedDateTime.parse("2019-12-31T23:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextMonthDayAst() {
+        assertEquals(ZonedDateTime.parse("2020-02-01T00:50:00Z"),
+            new CronExpression("00 50 * * 2 *")
+                .nextTimeAfter(ZonedDateTime.parse("2020-01-31T23:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextYearDayAst() {
+        assertEquals(ZonedDateTime.parse("2020-01-01T00:50:00Z"),
+            new CronExpression("00 50 * * 1 *")
+                .nextTimeAfter(ZonedDateTime.parse("2019-12-31T22:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextMonthAllAst() {
+        assertEquals(ZonedDateTime.parse("2020-02-01T00:50:00Z"),
+            new CronExpression("00 50 * * * *")
+                .nextTimeAfter(ZonedDateTime.parse("2020-01-31T23:50:00Z")));
+    }
+
+    @Test
+    public void testTriggerProblemNextYearAllAst() {
+        assertEquals(ZonedDateTime.parse("2020-01-01T00:50:00Z"),
+            new CronExpression("00 50 * * * *")
+                .nextTimeAfter(ZonedDateTime.parse("2019-12-31T23:50:00Z")));
+    }
 }