Issue 421 test

Author: Haarolean

src/test/java/Issue421Test.java

@@ -0,0 +1,85 @@
+import com.cronutils.builder.CronBuilder;
+import com.cronutils.descriptor.CronDescriptor;
+import com.cronutils.model.Cron;
+import com.cronutils.model.definition.CronConstraintsFactory;
+import com.cronutils.model.definition.CronDefinition;
+import com.cronutils.model.definition.CronDefinitionBuilder;
+import com.cronutils.model.time.ExecutionTime;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.time.*;
+import java.util.Locale;
+import java.util.Optional;
+
+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;
+import static junit.framework.TestCase.fail;
+
+public class Issue421Test {
+
+    private static final CronDefinition definition = CronDefinitionBuilder.defineCron()
+            .withMinutes().and()
+            .withHours().and()
+            .withDayOfWeek().supportsQuestionMark().and()
+            .withDayOfMonth().supportsL().supportsQuestionMark().and()
+            .withDayOfYear().supportsQuestionMark().and()
+            .withMonth().and()
+            .matchDayOfWeekAndDayOfMonth()
+            .withCronValidation(CronConstraintsFactory.ensureEitherDayOfWeekOrDayOfMonth())
+            .withCronValidation(CronConstraintsFactory.ensureEitherDayOfYearOrMonth())
+            .instance();
+
+    @Test
+    public void testWrongIntervalsForEvery6Months() {
+        LocalDateTime firstOfJanuary = LocalDateTime.of(2020, 4, 25, 0, 0);
+        Clock clock = Clock.fixed(firstOfJanuary.toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
+        ZonedDateTime now = ZonedDateTime.now(clock);
+        System.out.println("now: " + now);
+
+        Cron cron = getEveryMonth(now, 6).instance();
+        ZonedDateTime nextRun;
+
+        nextRun = nextRun(cron, now); // first run
+        Assert.assertEquals(2020, nextRun.getYear());
+        Assert.assertEquals(10, nextRun.getMonthValue());
+
+        nextRun = nextRun(cron, nextRun); // second
+        Assert.assertEquals(2021, nextRun.getYear());
+        Assert.assertEquals(4, nextRun.getMonthValue());
+    }
+
+    @Test
+    public void testWrongEveryXMonthsDescription() {
+        ZonedDateTime now = ZonedDateTime.now();
+
+        String description = CronDescriptor.instance(Locale.US).describe(getEveryMonth(now, 3).instance());
+        System.out.println(description);
+        Assert.assertTrue(description.contains("every 3 months"));
+
+        description = CronDescriptor.instance(Locale.US).describe(getEveryMonth(now, 6).instance());
+        System.out.println(description);
+        Assert.assertTrue(description.contains("every 6 months"));
+    }
+
+    public static CronBuilder getEveryMonth(ZonedDateTime now, int every) {
+        return CronBuilder.cron(definition)
+                .withMinute(on(now.getMinute()))
+                .withHour(on(now.getHour()))
+                .withDoW(questionMark())
+                .withDoM(on(now.getDayOfMonth()))
+                .withDoY(questionMark())
+                .withMonth(every(every));
+    }
+
+    private static ZonedDateTime nextRun(Cron cron, ZonedDateTime when) {
+        final Optional<ZonedDateTime> next = ExecutionTime.forCron(cron).nextExecution(when);
+        if (!next.isPresent()) {
+            fail();
+        }
+        System.out.println("Calculated next run at " + next.get());
+        return next.get();
+    }
+
+}