Merge pull request #54 from steffenbusch/unreachable-year-53

Remove inclRefTime from isUnreachableYear
adhocore · Nov 15, 2024 · fea40e3 · fea40e3
2 parents 292e1ca + 34c1adf
commit fea40e3
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 19 deletions.
diff --git a/next.go b/next.go
@@ -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])
 	}
 
@@ -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

diff --git a/next_test.go b/next_test.go
@@ -2,6 +2,7 @@ package gronx
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 	"time"
 )
@@ -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)
+				}
+			}
+		})
 	}
 }
diff --git a/prev.go b/prev.go
@@ -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])
 	}