@@ -358,11 +358,11 @@ func TestDaysOverlap(t *testing.T) {
358
358
func TestSchedulesOverlap (t * testing.T ) {
359
359
t .Parallel ()
360
360
testCases := []struct {
361
- name string
362
- s1 string
363
- s2 string
364
- overlap bool
365
- expectErr bool
361
+ name string
362
+ s1 string
363
+ s2 string
364
+ overlap bool
365
+ expectedErrMsg string
366
366
}{
367
367
// Basic overlap cases
368
368
{
@@ -466,34 +466,34 @@ func TestSchedulesOverlap(t *testing.T) {
466
466
467
467
// Error cases (keeping minimal)
468
468
{
469
- name : "Invalid hour range" ,
470
- s1 : "* 25-26 * * 1-5" ,
471
- s2 : "* 9-18 * * 1-5" ,
472
- expectErr : true ,
469
+ name : "Invalid hour range" ,
470
+ s1 : "* 25-26 * * 1-5" ,
471
+ s2 : "* 9-18 * * 1-5" ,
472
+ expectedErrMsg : "invalid hour range" ,
473
473
},
474
474
{
475
- name : "Invalid month range" ,
476
- s1 : "* 9-18 * 13 1-5" ,
477
- s2 : "* 9-18 * * 1-5" ,
478
- expectErr : true ,
475
+ name : "Invalid month range" ,
476
+ s1 : "* 9-18 * 13 1-5" ,
477
+ s2 : "* 9-18 * * 1-5" ,
478
+ expectedErrMsg : "invalid month range" ,
479
479
},
480
480
{
481
- name : "Invalid field count - too few fields" ,
482
- s1 : "* 9-18 * *" ,
483
- s2 : "* 9-18 * * 1-5" ,
484
- expectErr : true ,
481
+ name : "Invalid field count - too few fields" ,
482
+ s1 : "* 9-18 * *" ,
483
+ s2 : "* 9-18 * * 1-5" ,
484
+ expectedErrMsg : "has 4 fields, expected 5 fields" ,
485
485
},
486
486
{
487
- name : "Invalid field count - too many fields" ,
488
- s1 : "* 9-18 * * 1-5 *" ,
489
- s2 : "* 9-18 * * 1-5" ,
490
- expectErr : true ,
487
+ name : "Invalid field count - too many fields" ,
488
+ s1 : "* 9-18 * * 1-5 *" ,
489
+ s2 : "* 9-18 * * 1-5" ,
490
+ expectedErrMsg : "has 6 fields, expected 5 fields" ,
491
491
},
492
492
{
493
- name : "Invalid field count - s2 has too few fields" ,
494
- s1 : "* 9-18 * * 1-5" ,
495
- s2 : "* 9-18 * *" ,
496
- expectErr : true ,
493
+ name : "Invalid field count - s2 has too few fields" ,
494
+ s1 : "* 9-18 * * 1-5" ,
495
+ s2 : "* 9-18 * *" ,
496
+ expectedErrMsg : "has 4 fields, expected 5 fields" ,
497
497
},
498
498
}
499
499
@@ -503,12 +503,13 @@ func TestSchedulesOverlap(t *testing.T) {
503
503
t .Parallel ()
504
504
505
505
overlap , err := helpers .SchedulesOverlap (testCase .s1 , testCase .s2 )
506
- if testCase .expectErr {
506
+ if testCase .expectedErrMsg != "" {
507
507
require .Error (t , err )
508
- return
508
+ require .Contains (t , err .Error (), testCase .expectedErrMsg )
509
+ } else {
510
+ require .NoError (t , err )
511
+ require .Equal (t , testCase .overlap , overlap )
509
512
}
510
- require .NoError (t , err )
511
- require .Equal (t , testCase .overlap , overlap )
512
513
})
513
514
}
514
515
}
0 commit comments