Merge pull request #488 from IndeedSi/480-fix-incorrect-definition-in-test

#480  The unit test didn't define valid DoW value, which caused the test failure

Author: jmrozanec

.github/workflows/maven-test.yml

@@ -18,15 +18,16 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '8', '11', '16' ]
+        java: [ '16' ]
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK
+      uses: actions/setup-java@v2
       with:
+        distribution: 'zulu'
         java-version: ${{ matrix.java }}
 
     - name: compile and test

src/test/java/com/cronutils/Issue480Test.java

@@ -29,7 +29,7 @@ public class Issue480Test {
     private static final CronDefinition definition = CronDefinitionBuilder.defineCron()
             .withMinutes().and()
             .withHours().and()
-            .withDayOfWeek().supportsQuestionMark().and()
+            .withDayOfWeek().withValidRange(1, 7).withMondayDoWValue(1).supportsQuestionMark().and()
             .withDayOfMonth().supportsL().supportsQuestionMark().and()
             .withDayOfYear().supportsQuestionMark().and()
             .withMonth().and()
@@ -40,7 +40,6 @@ public class Issue480Test {
             .instance();
 
     @Test
-    @Ignore // TODO broken??
     public void testIntervalsEvery5thMonthsSinceASpecificMonth() {
         LocalDateTime sunday = LocalDateTime.of(2021, 6, 27, 0, 0);
         Assert.assertEquals(sunday.getDayOfWeek(), DayOfWeek.SUNDAY);
@@ -65,8 +64,8 @@ private CronBuilder getWeekly(ZonedDateTime now) {
         return CronBuilder.cron(definition)
                 .withMinute(on(now.getMinute()))
                 .withHour(on(now.getHour()))
-                .withDoW(on(now.getDayOfWeek().ordinal())) // ordinal -- 0 to 6
-//              .withDoW(on(now.getDayOfWeek().getValue())) // value -- 1 to 7
+//                .withDoW(on(now.getDayOfWeek().ordinal())) // ordinal -- 0 to 6, This is a wrong way of mapping
+                .withDoW(on(now.getDayOfWeek().getValue())) // value -- 1 to 7
                 .withDoM(questionMark())
                 .withDoY(questionMark())
                 .withMonth(always())