Merge branch 'Lifeindeath-fix_every_expression_behavior_#421'

Author: jmrozanec

src/main/java/com/cronutils/descriptor/DescriptionStrategyFactory.java

@@ -13,6 +13,7 @@
 
 package com.cronutils.descriptor;
 
+import com.cronutils.model.field.expression.Every;
 import java.time.DayOfWeek;
 import java.time.Month;
 import java.time.format.TextStyle;
@@ -102,7 +103,13 @@ public static DescriptionStrategy daysOfMonthInstance(final ResourceBundle bundl
      * @return - DescriptionStrategy instance, never null
      */
     public static DescriptionStrategy monthsInstance(final ResourceBundle bundle, final FieldExpression expression) {
-        return new NominalDescriptionStrategy(bundle, integer -> Month.of(integer).getDisplayName(TextStyle.FULL, bundle.getLocale()), expression);
+        Function<Integer, String> mappingFunction;
+        if (expression instanceof Every) {
+            mappingFunction = Object::toString;
+        } else {
+            mappingFunction = integer -> Month.of(integer).getDisplayName(TextStyle.FULL, bundle.getLocale());
+        }
+        return new NominalDescriptionStrategy(bundle, mappingFunction, expression);
     }
 
     /**

src/main/java/com/cronutils/model/field/expression/Every.java

@@ -18,7 +18,9 @@
 
 /**
  * Represents every x time on a cron field.
- */
+ * Usage examples:
+ * - To represent a scheduling every 3 months on a specific time (the standard 0 0 0 */3 *), use the Every(3) constructor
+ * - To represent a scheduling every 3 months FROM NOW, use the Every(on(now.getMonth, 3)) constructor */
 public class Every extends FieldExpression {
 
     private static final long serialVersionUID = -1103196842332906994L;

src/test/java/com/cronutils/Issue421Test.java

@@ -34,29 +34,72 @@ public class Issue421Test {
             .withCronValidation(CronConstraintsFactory.ensureEitherDayOfYearOrMonth())
             .instance();
 
-    @Ignore
     @Test
     public void testWrongIntervalsForEvery6Months() {
-        LocalDateTime firstOfJanuary = LocalDateTime.of(2020, 4, 25, 0, 0);
+        LocalDateTime dayOfApril = LocalDateTime.of(2020, 4, 25, 0, 0);
+        Clock clock = Clock.fixed(dayOfApril.toInstant(ZoneOffset.UTC), ZoneId.systemDefault());
+        ZonedDateTime dayOfAprilInLocalTimezone = ZonedDateTime.now(clock);
+        System.out.println("now: " + dayOfAprilInLocalTimezone);
+        Cron cron = getEveryMonthFromNow(dayOfAprilInLocalTimezone, 6).instance();
+
+        ZonedDateTime nextRun = nextRun(cron, dayOfAprilInLocalTimezone); // first run
+        Assert.assertEquals(2020, nextRun.getYear());
+        Assert.assertEquals(10, nextRun.getMonthValue());
+
+        nextRun = nextRun(cron, nextRun); // second
+        System.out.println(nextRun);
+        Assert.assertEquals(2021, nextRun.getYear());
+        Assert.assertEquals(4, nextRun.getMonthValue());
+    }
+
+    @Test
+    public void testIntervalsEvery5thMonthsSinceASpecificMonth() {
+        LocalDateTime firstOfJanuary = LocalDateTime.of(2020, 2, 10, 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();
+        Cron cron = getEveryMonthFromNow(now, 5).instance();
         ZonedDateTime nextRun;
 
         nextRun = nextRun(cron, now); // first run
         Assert.assertEquals(2020, nextRun.getYear());
-        Assert.assertEquals(10, nextRun.getMonthValue());
+        Assert.assertEquals(7, nextRun.getMonthValue());
 
-        nextRun = nextRun(cron, nextRun); // second
+        nextRun = nextRun(cron, nextRun); // first run
+        Assert.assertEquals(2020, nextRun.getYear());
+        Assert.assertEquals(12, nextRun.getMonthValue());
+
+        nextRun = nextRun(cron, nextRun); // first run
         Assert.assertEquals(2021, nextRun.getYear());
-        Assert.assertEquals(4, nextRun.getMonthValue());
+        Assert.assertEquals(2, nextRun.getMonthValue());
     }
 
-    @Ignore
     @Test
-    public void testWrongEveryXMonthsDescription() {
+    public void testIntervalsEvery5thMonth() {
+        LocalDateTime firstOfJanuary = LocalDateTime.of(2020, 2, 10, 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, 5).instance();
+        ZonedDateTime nextRun;
+
+        nextRun = nextRun(cron, now); // first run
+        Assert.assertEquals(2020, nextRun.getYear());
+        Assert.assertEquals(6, nextRun.getMonthValue());
+
+        nextRun = nextRun(cron, nextRun); // first run
+        Assert.assertEquals(2020, nextRun.getYear());
+        Assert.assertEquals(11, nextRun.getMonthValue());
+
+        nextRun = nextRun(cron, nextRun); // first run
+        Assert.assertEquals(2021, nextRun.getYear());
+        Assert.assertEquals(1, nextRun.getMonthValue());
+    }
+
+    @Test
+    public void testDescriptionEveryXMonths() {
         ZonedDateTime now = ZonedDateTime.now();
 
         String description = CronDescriptor.instance(Locale.US).describe(getEveryMonth(now, 3).instance());
@@ -77,6 +120,15 @@ public static CronBuilder getEveryMonth(ZonedDateTime now, int every) {
                 .withDoY(questionMark())
                 .withMonth(every(every));
     }
+    public static CronBuilder getEveryMonthFromNow(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(on(now.getMonthValue()), every));
+    }
 
     private static ZonedDateTime nextRun(Cron cron, ZonedDateTime when) {
         final Optional<ZonedDateTime> next = ExecutionTime.forCron(cron).nextExecution(when);

src/test/java/com/cronutils/Issue430Test.java

@@ -7,11 +7,13 @@
 import com.cronutils.model.time.ExecutionTime;
 import com.cronutils.parser.CronParser;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
+@Ignore
 public class Issue430Test {
     @Test
     public void test() {