Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set nanos part to 0 for next seconds field match #617

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Set nanos part to 0 for next seconds field match #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0912bd
Implement test for problematic non-zero nanos time
dllx Feb 8, 2024
983e0d8
Set nanos part to 0 for next seconds field match
dllx Feb 8, 2024
43492cc
Cleanup and extend test to isMatch and lastExecution
dllx Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/com/cronutils/model/time/SingleExecutionTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,15 @@ private ExecutionTimeResult potentialNextClosestMatch(final ZonedDateTime date)
if (!minutes.getValues().contains(date.getMinute())) {
return getNextPotentialMinute(date);
}
if (!seconds.getValues().contains(date.getSecond())) {
return getNextPotentialSecond(date);
// Rationale for rounding up the nanos:
// If nanos != 0, then the matched seconds field time is already in the past.
// Additionally, all other fields return the next match with nanos set to zero
ZonedDateTime dateWithRoundedUpNanos = date.getNano() == 0 ? date : date.plusNanos(1_000_000_000 - date.getNano());
if (!seconds.getValues().contains(dateWithRoundedUpNanos.getSecond())) {
return getNextPotentialSecond(dateWithRoundedUpNanos);
}

return new ExecutionTimeResult(date, true);
return new ExecutionTimeResult(dateWithRoundedUpNanos, true);
}

private ExecutionTimeResult getNextPotentialYear(final ZonedDateTime date,
Expand Down
214 changes: 214 additions & 0 deletions src/test/java/com/cronutils/model/time/ExecutionTimeNanosTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
package com.cronutils.model.time;

import com.cronutils.model.Cron;
import com.cronutils.model.definition.CronDefinition;
import com.cronutils.model.definition.CronDefinitionBuilder;
import com.cronutils.parser.CronParser;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Optional;
import java.util.stream.Stream;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

public class ExecutionTimeNanosTest {
public static ExecutionTime createExecutionTimeWithSeconds() {
CronDefinition cronDefinition = CronDefinitionBuilder.defineCron()
.withSeconds().and()
.withMinutes().and()
.withHours().and()
.withDayOfMonth().and()
.withMonth().and()
.instance();
Cron cron = new CronParser(cronDefinition)
.parse("0,1,3 * * * *");

return ExecutionTime.forCron(cron);
}

public static ExecutionTime createExecutionTimeWithoutSeconds() {
CronDefinition cronDefinition = CronDefinitionBuilder.defineCron()
.withMinutes().and()
.withHours().and()
.withDayOfMonth().and()
.withMonth().and()
.instance();
Cron cron = new CronParser(cronDefinition)
.parse("0,1,3 * * *");

return ExecutionTime.forCron(cron);
}

public static Stream<Arguments> cronExpressionsWithSeconds() {
// args are "now", "isMatch", "expectedNext", "expectedLast"
// for cron "0,1,3 * * * *"
return Stream.of(
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 0, 0, ZoneOffset.UTC),
true,
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 45, 3, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 0, 999999999, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 46, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 0, ZoneOffset.UTC),
true,
ZonedDateTime.of(2024, 2, 7, 13, 46, 3, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 46, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 999999999, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 46, 3, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 2, 0, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 46, 3, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 2, 999999999, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 46, 3, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 3, 0, ZoneOffset.UTC),
true,
ZonedDateTime.of(2024, 2, 7, 13, 47, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 46, 1, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 46, 3, 999999999, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 47, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 46, 3, 0, ZoneOffset.UTC)
)
);
}

public static Stream<Arguments> cronExpressionsWithoutSeconds() {
// args are "now", "isMatch", "expectedNext", "expectedLast"
// for cron "0,1,3 * * *"
return Stream.of(
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 0, 0, 0, ZoneOffset.UTC),
true,
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 12, 3, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 0, 0, 999999999, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 0, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 0, ZoneOffset.UTC),
true,
ZonedDateTime.of(2024, 2, 7, 13, 3, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 0, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 999999999, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 3, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 2, 0, 0, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 3, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 2, 0, 999999999, ZoneOffset.UTC),
false,
ZonedDateTime.of(2024, 2, 7, 13, 3, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 3, 0, 0, ZoneOffset.UTC),
true,
ZonedDateTime.of(2024, 2, 7, 14, 0, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 1, 0, 0, ZoneOffset.UTC)
),
Arguments.of(
ZonedDateTime.of(2024, 2, 7, 13, 3, 0, 999999999, ZoneOffset.UTC),
true,
ZonedDateTime.of(2024, 2, 7, 14, 0, 0, 0, ZoneOffset.UTC),
ZonedDateTime.of(2024, 2, 7, 13, 3, 0, 0, ZoneOffset.UTC)
)
);
}

@ParameterizedTest
@MethodSource("cronExpressionsWithSeconds")
public void testIsMatchWithSeconds(ZonedDateTime now, boolean expectedIsMatch) {
ExecutionTime executionTime = createExecutionTimeWithSeconds();

boolean isMatch = executionTime.isMatch(now);
assertEquals(expectedIsMatch, isMatch);
}

@ParameterizedTest
@MethodSource("cronExpressionsWithSeconds")
public void testNextExecutionWithSeconds(ZonedDateTime now, boolean ignored1, ZonedDateTime expectedNext) {
ExecutionTime executionTime = createExecutionTimeWithSeconds();

Optional<ZonedDateTime> nextTime = executionTime.nextExecution(now);
assertTrue(nextTime.isPresent());
assertEquals(expectedNext, nextTime.get());
}

@ParameterizedTest
@MethodSource("cronExpressionsWithSeconds")
public void testLastExecutionWithSeconds(ZonedDateTime now, boolean ignored1, ZonedDateTime ignored2, ZonedDateTime expectedLast) {
ExecutionTime executionTime = createExecutionTimeWithSeconds();

Optional<ZonedDateTime> lastTime = executionTime.lastExecution(now);
assertTrue(lastTime.isPresent());
assertEquals(expectedLast, lastTime.get());
}

@ParameterizedTest
@MethodSource("cronExpressionsWithoutSeconds")
public void testIsMatchWithoutSeconds(ZonedDateTime now, boolean expectedIsMatch) {
ExecutionTime executionTime = createExecutionTimeWithoutSeconds();

boolean isMatch = executionTime.isMatch(now);
assertEquals(expectedIsMatch, isMatch);
}

@ParameterizedTest
@MethodSource("cronExpressionsWithoutSeconds")
public void testNextExecutionWithoutSeconds(ZonedDateTime now, boolean ignored, ZonedDateTime expectedNext) {
ExecutionTime executionTime = createExecutionTimeWithoutSeconds();

Optional<ZonedDateTime> nextTime = executionTime.nextExecution(now);
assertTrue(nextTime.isPresent());
assertEquals(expectedNext, nextTime.get());
}

@ParameterizedTest
@MethodSource("cronExpressionsWithoutSeconds")
public void testLastExecutionWithoutSeconds(ZonedDateTime now, boolean ignored1, ZonedDateTime ignored2, ZonedDateTime expectedLast) {
ExecutionTime executionTime = createExecutionTimeWithoutSeconds();

Optional<ZonedDateTime> lastTime = executionTime.lastExecution(now);
assertTrue(lastTime.isPresent());
assertEquals(expectedLast, lastTime.get());
}
}