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

Remove inclRefTime from isUnreachableYear #54

Merged
merged 3 commits into from
Nov 15, 2024
Merged

Remove inclRefTime from isUnreachableYear #54

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
04b8bc3
Add test case to replicate issue #53
steffenbusch Nov 14, 2024
0667a01
Add more tests for unreachable year
steffenbusch Nov 14, 2024
34c1adf
Remove inclRefTime from unreachableYear check
steffenbusch Nov 14, 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
12 changes: 3 additions & 9 deletions next.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func NextTickAfter(expr string, start time.Time, inclRefTime bool) (time.Time, e
}

segments, _ := Segments(expr)
if len(segments) > 6 && isUnreachableYear(segments[6], next, inclRefTime, false) {
if len(segments) > 6 && isUnreachableYear(segments[6], next, false) {
return next, fmt.Errorf("unreachable year segment: %s", segments[6])
}

Expand Down Expand Up @@ -123,18 +123,12 @@ over:

var dashRe = regexp.MustCompile(`/.*$`)

func isUnreachableYear(year string, ref time.Time, incl bool, reverse bool) bool {
func isUnreachableYear(year string, ref time.Time, reverse bool) bool {
if year == "*" || year == "?" {
return false
}

edge, inc := ref.Year(), 1
if !incl {
if reverse {
inc = -1
}
edge += inc
}
edge := ref.Year()
for _, offset := range strings.Split(year, ",") {
if strings.Index(offset, "*/") == 0 || strings.Index(offset, "0/") == 0 {
return false
Expand Down
98 changes: 89 additions & 9 deletions next_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package gronx

import (
"fmt"
"strings"
"testing"
"time"
)
Expand Down Expand Up @@ -73,17 +74,96 @@ func TestNextTickAfter(t *testing.T) {
})
}

// https://github.com/adhocore/gronx/issues/51
func TestIsUnreachableYearCurrentYear(t *testing.T) {
func TestIsUnreachableYearPrevTickBefore(t *testing.T) {
now := time.Date(2024, time.November, 8, 22, 18, 16, 0, time.UTC)
tests := []struct {
name string
cronExpr string
expectedTime time.Time
expectError bool
}{
{
// https://github.com/adhocore/gronx/issues/51
name: "Current Year - Previous Tick",
cronExpr: "30 15 4 11 * 2024",
expectedTime: time.Date(2024, time.November, 4, 15, 30, 0, 0, time.UTC),
expectError: false,
},
{
name: "Next Year - Previous Tick (Unreachable Year)",
cronExpr: "30 15 4 11 * 2025",
expectedTime: time.Time{}, // Error expected
expectError: true,
},
{
name: "Previous Year - Previous Tick",
cronExpr: "30 15 4 11 * 2023",
expectedTime: time.Date(2023, time.November, 4, 15, 30, 0, 0, time.UTC),
expectError: false,
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actualTime, err := PrevTickBefore(tc.cronExpr, now, true)
if tc.expectError {
if err == nil || !strings.Contains(err.Error(), "unreachable year segment") {
t.Errorf("expected unreachable year error, got: %v", err)
}
} else {
if err != nil {
t.Errorf("unexpected error: %v", err)
} else if !actualTime.Equal(tc.expectedTime) {
t.Errorf("expected previous tick to be %v, got %v", tc.expectedTime, actualTime)
}
}
})
}
}

cronExpr := "30 15 4 11 * 2024"
expectedTime := time.Date(2024, time.November, 4, 15, 30, 0, 0, time.UTC)
actualTime, err := PrevTickBefore(cronExpr, now, true)
func TestIsUnreachableYearNextTickAfter(t *testing.T) {
now := time.Date(2024, time.November, 8, 22, 18, 16, 0, time.UTC)
tests := []struct {
name string
cronExpr string
expectedTime time.Time
expectError bool
}{
{
// https://github.com/adhocore/gronx/issues/53
name: "Current Year - Next Tick",
cronExpr: "30 15 31 12 * 2024",
expectedTime: time.Date(2024, time.December, 31, 15, 30, 0, 0, time.UTC),
expectError: false,
},
{
name: "Next Year - Next Tick",
cronExpr: "30 15 31 12 * 2025",
expectedTime: time.Date(2025, time.December, 31, 15, 30, 0, 0, time.UTC),
expectError: false,
},
{
name: "Previous Year - Next Tick (Unreachable Year)",
cronExpr: "30 15 31 12 * 2023",
expectedTime: time.Time{}, // Error expected
expectError: true,
},
}

if err != nil {
t.Errorf("got unexpected error: %s", err)
} else if !actualTime.Equal(expectedTime) {
t.Errorf("expected previous tick to be %v, got %v", expectedTime, actualTime)
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
actualTime, err := NextTickAfter(tc.cronExpr, now, false)
if tc.expectError {
if err == nil || !strings.Contains(err.Error(), "unreachable year segment") {
t.Errorf("expected unreachable year error, got: %v", err)
}
} else {
if err != nil {
t.Errorf("unexpected error: %v", err)
} else if !actualTime.Equal(tc.expectedTime) {
t.Errorf("expected next tick to be %v, got %v", tc.expectedTime, actualTime)
}
}
})
}
}
2 changes: 1 addition & 1 deletion prev.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func PrevTickBefore(expr string, start time.Time, inclRefTime bool) (time.Time,
}

segments, _ := Segments(expr)
if len(segments) > 6 && isUnreachableYear(segments[6], prev, inclRefTime, true) {
if len(segments) > 6 && isUnreachableYear(segments[6], prev, true) {
return prev, fmt.Errorf("unreachable year segment: %s", segments[6])
}

Expand Down
Loading