#528: Fixes for issues revailed in failing tests.

Author: jmrozanec

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

@@ -14,6 +14,7 @@
 package com.cronutils.descriptor;
 
 import com.cronutils.model.Cron;
+import com.cronutils.model.RebootCron;
 import com.cronutils.model.field.CronField;
 import com.cronutils.model.field.CronFieldName;
 import com.cronutils.model.field.definition.FieldDefinition;
@@ -66,6 +67,9 @@ private CronDescriptor() {
      */
     public String describe(final Cron cron) {
         Preconditions.checkNotNull(cron, "Cron must not be null");
+        if(cron instanceof RebootCron){
+            return resourceBundle.getString("on_reboot");
+        }
         final Map<CronFieldName, CronField> expressions = cron.retrieveFieldsAsMap();
         final Map<CronFieldName, FieldDefinition> fieldDefinitions = cron.getCronDefinition().retrieveFieldDefinitionsAsMap();
 

src/main/java/com/cronutils/mapper/CronMapper.java

@@ -16,9 +16,11 @@
 import com.cronutils.Function;
 import com.cronutils.model.Cron;
 import com.cronutils.model.CronType;
+import com.cronutils.model.RebootCron;
 import com.cronutils.model.SingleCron;
 import com.cronutils.model.definition.CronDefinition;
 import com.cronutils.model.definition.CronDefinitionBuilder;
+import com.cronutils.model.definition.CronNicknames;
 import com.cronutils.model.field.CronField;
 import com.cronutils.model.field.CronFieldName;
 import com.cronutils.model.field.constraint.FieldConstraints;
@@ -73,6 +75,13 @@ public CronMapper(final CronDefinition from, final CronDefinition to, final Func
      */
     public Cron map(final Cron cron) {
         Preconditions.checkNotNull(cron, "Cron must not be null");
+        if(cron instanceof RebootCron){
+            if(this.to.getCronNicknames().contains(CronNicknames.REBOOT)){
+                return new RebootCron(this.to);
+            } else {
+                throw new IllegalArgumentException("The target cron definition does not support @reboot nickname");
+            }
+        }
         final List<CronField> fields = new ArrayList<>();
         for (final CronFieldName name : CronFieldName.values()) {
             if (mappings.containsKey(name)) {

src/main/java/com/cronutils/model/time/ExecutionTime.java

@@ -184,7 +184,7 @@ default List<ZonedDateTime> getExecutionDates(ZonedDateTime startDate, ZonedDate
         ZonedDateTime nextExecutionDate = nextExecution(startDate).orElse(null);
 
         if (nextExecutionDate == null) return Collections.emptyList();
-        while(nextExecutionDate != null && nextExecutionDate.isBefore(endDate)){
+        while(nextExecutionDate != null && (nextExecutionDate.isBefore(endDate) || nextExecutionDate.equals(endDate))){
             executions.add(nextExecutionDate);
             nextExecutionDate = nextExecution(nextExecutionDate).orElse(null);
         }

src/main/resources/CronUtilsI18N.properties

@@ -29,5 +29,6 @@ every_one=every
 every_multi=every
 oneSecond=second
 multipleSeconds={2} seconds
+on_reboot=on reboot
 
 pattern_at_second=at second {0}

src/test/java/com/cronutils/Issue528Test.java

@@ -7,37 +7,35 @@
 import com.cronutils.model.definition.CronDefinitionBuilder;
 import com.cronutils.model.time.ExecutionTime;
 import com.cronutils.parser.CronParser;
+import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 
 import java.time.ZonedDateTime;
 import java.util.Locale;
 import java.util.Optional;
 
-class Issue528Test {
-
-    static final CronDefinition REBOOT_CRON_DEFINITION = CronDefinitionBuilder.defineCron()
+public class Issue528Test {
+    private static final CronDefinition REBOOT_CRON_DEFINITION = CronDefinitionBuilder.defineCron()
             .withSupportedNicknameReboot()
             .instance();
 
     @Test
-    void testRebootExecutionTime() {
+    public void testRebootExecutionTime() {
         Cron cron = new CronParser(REBOOT_CRON_DEFINITION).parse("@reboot");
         ExecutionTime executionTime = ExecutionTime.forCron(cron);
         Assertions.assertEquals(Optional.empty(), executionTime.nextExecution(ZonedDateTime.now()));
         Assertions.assertEquals(Optional.empty(), executionTime.lastExecution(ZonedDateTime.now()));
     }
 
     @Test
-    void testCronDescriptor() {
+    public void testCronDescriptor() {
         Cron cron = new CronParser(REBOOT_CRON_DEFINITION).parse("@reboot");
         String description = CronDescriptor.instance(Locale.UK).describe(cron);
         Assertions.assertEquals("on reboot", description);
     }
 
-
     @Test
-    void testCronMapper() {
+    public void testCronMapperRebootSupportedOnTarget() {
         Cron cron = new CronParser(REBOOT_CRON_DEFINITION).parse("@reboot");
         CronDefinition unix = CronDefinitionBuilder.defineCron()
                 .withMinutes().withValidRange(0, 59).withStrictRange().and()
@@ -50,4 +48,18 @@ void testCronMapper() {
         Cron mapped = CronMapper.sameCron(unix).map(cron);
         Assertions.assertEquals(cron.asString(), mapped.asString());
     }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCronMapperRebootNotSupportedOnTarget() {
+        Cron cron = new CronParser(REBOOT_CRON_DEFINITION).parse("@reboot");
+        CronDefinition unix = CronDefinitionBuilder.defineCron()
+                .withMinutes().withValidRange(0, 59).withStrictRange().and()
+                .withHours().withValidRange(0, 23).withStrictRange().and()
+                .withDayOfMonth().withValidRange(1, 31).withStrictRange().and()
+                .withMonth().withValidRange(1, 12).withStrictRange().and()
+                .withDayOfWeek().withValidRange(0, 7).withMondayDoWValue(1).withIntMapping(7, 0).withStrictRange().and()
+                .instance();
+        Cron mapped = CronMapper.sameCron(unix).map(cron);
+        Assertions.assertEquals(cron.asString(), mapped.asString());
+    }
 }

src/test/java/com/cronutils/parser/CronParserQuartzIntegrationTest.java

@@ -24,7 +24,6 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.internal.matchers.ThrowableMessageMatcher;
 import org.junit.rules.ExpectedException;
 
 import java.time.ZonedDateTime;