Skip to content

Commit

Permalink
Extending the InvariantCulture fix and moving unittests
Browse files Browse the repository at this point in the history
  • Loading branch information
Vojtěch Štorek committed Dec 16, 2024
1 parent 17e9a35 commit a12031a
Show file tree
Hide file tree
Showing 3 changed files with 150 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Src/Coravel/Scheduling/Schedule/Cron/CronExpressionComplexPart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public CronExpressionComplexPart(string expression)
/// <returns></returns>
public bool CheckIfTimeIsDue(int time)
{
var isRange = _expression.IndexOf('-') > -1;
var isDivisibleRange = isRange && _expression.IndexOf('/') > -1;
var isDelineatedArray = _expression.IndexOf(',') > -1;
var isRange = _expression.IndexOf('-', StringComparison.InvariantCulture) > -1;
var isDivisibleRange = isRange && _expression.IndexOf('/', StringComparison.InvariantCulture) > -1;
var isDelineatedArray = _expression.IndexOf(',', StringComparison.InvariantCulture) > -1;

if (isRange && isDelineatedArray)
{
Expand Down
141 changes: 141 additions & 0 deletions Src/UnitTests/CoravelUnitTests/Scheduling/IntervalTests/SchedulerCronTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
using System.Threading;
using System.Threading.Tasks;
using Coravel.Scheduling.Schedule;
using Coravel.Scheduling.Schedule.Mutex;
Expand Down Expand Up @@ -135,5 +136,145 @@ public async Task ScheduledEventCron(string cronExpression, string dateString, b

Assert.Equal(shouldRun, taskRan);
}

[Theory]
// Always
[InlineData("* * * * *", "1/1/2018 12:00 am", true, "cs-CZ")]
[InlineData("* * * * *", "1/1/2018 12:01 am", true, "th-TH")]
[InlineData("* * * * *", "1/1/2018 1:59 am", true, "fr-FR")]
[InlineData("* * * * *", "1/1/2018 6:22 pm", true, "pt-BR")]
// Minutes
[InlineData("05 * * * *", "1/1/2018 6:04 pm", false, "de-DE")]
[InlineData("05 * * * *", "1/1/2018 6:05 pm", true, "bo-IN")]
[InlineData("05 * * * *", "1/1/2018 6:06 pm", false, "teo-KE")]
[InlineData("05,07 * * * *", "1/1/2018 1:05 am", true, "es-ES")]
[InlineData("05,07 * * * *", "1/1/2018 1:06 am", false, "th-TH")]
[InlineData("05,07 * * * *", "1/1/2018 1:07 am", true, "th-TH")]
[InlineData("22-25 * * * *", "1/1/2018 5:21 am", false, "th-TH")]
[InlineData("22-25 * * * *", "1/1/2018 5:22 am", true, "th-TH")]
[InlineData("22-25 * * * *", "1/1/2018 5:23 am", true, "th-TH")]
[InlineData("22-25 * * * *", "1/1/2018 5:25 am", true, "th-TH")]
[InlineData("22-25 * * * *", "1/1/2018 5:26 am", false, "th-TH")]
[InlineData("*/5 * * * *", "8/14/2018 5:00 am", true, "th-TH")]
[InlineData("*/5 * * * *", "8/14/2018 10:05 am", true, "th-TH")]
[InlineData("*/5 * * * *", "8/14/2018 10:15 am", true, "th-TH")]
[InlineData("*/5 * * * *", "8/14/2018 5:01 am", false, "th-TH")]
[InlineData("*/5 * * * *", "8/14/2018 10:14 am", false, "th-TH")]
[InlineData("*/5 * * * *", "8/14/2018 10:16 am", false, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 2:00 am", true, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 4:02 am", true, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 10:54 am", true, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 12:00 am", true, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 2:01 am", false, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 4:03 am", false, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 10:55 am", false, "th-TH")]
[InlineData("*/2 * * * *", "8/14/2018 12:13 am", false, "th-TH")]
// Hours
[InlineData("* 05 * * *", "1/1/2018 4:04 am", false, "cs-CZ")]
[InlineData("* 05 * * *", "1/1/2018 5:05 am", true, "th-TH")]
[InlineData("* 5 * * *", "1/1/2018 6:00 pm", false, "fr-FR")]
[InlineData("* 5-7 * * *", "1/1/2018 5:33 am", true, "pt-BR")]
[InlineData("* 5-7 * * *", "1/1/2018 6:33 am", true, "de-DE")]
[InlineData("* 5-7 * * *", "1/1/2018 7:33 am", true, "bo-IN")]
[InlineData("* 20,22 * * *", "1/1/2018 11:00 pm", false, "teo-KE")]
[InlineData("* 20,22 * * *", "1/1/2018 11:59 pm", false, "es-ES")]
[InlineData("* 20,22 * * *", "1/1/2018 10:59 pm", true, "th-TH")]
[InlineData("* */2 * * *", "1/1/2018 4:04 am", true, "th-TH")]
[InlineData("* */2 * * *", "1/1/2018 10:04 am", true, "th-TH")]
[InlineData("* */2 * * *", "1/1/2018 12:04 pm", true, "th-TH")]
[InlineData("* */2 * * *", "1/1/2018 5:04 am", false, "th-TH")]
[InlineData("* */2 * * *", "1/1/2018 11:04 am", false, "th-TH")]
[InlineData("* */2 * * *", "1/1/2018 9:04 pm", false, "th-TH")]
[InlineData("* */3 * * *", "1/1/2018 3:04 am", true, "th-TH")]
[InlineData("* */3 * * *", "1/1/2018 9:04 am", true, "th-TH")]
[InlineData("* */3 * * *", "1/1/2018 12:04 pm", true, "th-TH")]
[InlineData("* */3 * * *", "1/1/2018 1:04 am", false, "th-TH")]
[InlineData("* */3 * * *", "1/1/2018 5:04 am", false, "th-TH")]
[InlineData("* */3 * * *", "1/1/2018 11:04 pm", false, "th-TH")]
// Day
[InlineData("* * 11 * *", "1/11/2018 10:59 pm", true, "cs-CZ")]
[InlineData("* * 11 * *", "1/12/2018 10:59 pm", false, "th-TH")]
[InlineData("* * 11,13,15 * *", "1/11/2018 10:59 pm", true, "fr-FR")]
[InlineData("* * 11,13,15 * *", "1/12/2018 10:59 pm", false, "pt-BR")]
[InlineData("* * 11,13,15 * *", "1/13/2018 10:59 pm", true, "de-DE")]
[InlineData("* * 11,13,15 * *", "1/14/2018 10:59 pm", false, "bo-IN")]
[InlineData("* * 11,13,15 * *", "1/15/2018 10:59 pm", true, "teo-KE")]
[InlineData("* * 25-27 * *", "1/24/2018 10:59 pm", false, "es-ES")]
[InlineData("* * 25-27 * *", "1/25/2018 10:59 pm", true, "th-TH")]
[InlineData("* * 25-27 * *", "1/26/2018 10:59 pm", true, "th-TH")]
[InlineData("* * 25-27 * *", "1/27/2018 10:59 pm", true, "th-TH")]
[InlineData("* * 25-27 * *", "1/28/2018 10:59 pm", false, "th-TH")]
// Month
[InlineData("* * * 5 *", "4/25/2018 10:59 pm", false, "cs-CZ")]
[InlineData("* * * 5 *", "5/25/2018 10:59 pm", true, "th-TH")]
[InlineData("* * * 5 *", "6/25/2018 10:59 pm", false, "fr-FR")]
[InlineData("* * * 5-7 *", "4/25/2018 10:59 pm", false, "pt-BR")]
[InlineData("* * * 5-7 *", "5/25/2018 10:59 pm", true, "de-DE")]
[InlineData("* * * 5-7 *", "6/25/2018 10:59 pm", true, "bo-IN")]
[InlineData("* * * 5-7 *", "7/25/2018 10:59 pm", true, "teo-KE")]
[InlineData("* * * 5-7 *", "8/25/2018 10:59 pm", false, "es-ES")]
[InlineData("* * * 7,11 *", "6/25/2018 10:59 pm", false, "th-TH")]
[InlineData("* * * 7,11 *", "7/25/2018 10:59 pm", true, "th-TH")]
[InlineData("* * * 7,11 *", "8/25/2018 10:59 pm", false, "th-TH")]
[InlineData("* * * 7,11 *", "10/25/2018 10:59 pm", false, "th-TH")]
[InlineData("* * * 7,11 *", "11/25/2018 10:59 pm", true, "th-TH")]
[InlineData("* * * 7,11 *", "12/25/2018 10:59 pm", false, "th-TH")]
[InlineData("* * * */5 *", "5/25/2018 10:59 pm", true, "th-TH")]
[InlineData("* * * */5 *", "10/25/2018 10:59 pm", true, "th-TH")]
[InlineData("* * * */5 *", "4/25/2018 10:59 pm", false, "th-TH")]
[InlineData("* * * */5 *", "11/25/2018 10:59 pm", false, "th-TH")]
// Week Day
[InlineData("* * * * 0", "8/12/2018 10:59 pm", true, "cs-CZ")]
[InlineData("* * * * 0", "8/13/2018 10:59 pm", false, "th-TH")]
[InlineData("* * * * 0", "8/18/2018 10:59 pm", false, "fr-FR")]
[InlineData("* * * * 0", "8/19/2018 10:59 pm", true, "pt-BR")]
[InlineData("* * * * 0,6", "8/12/2018 10:59 pm", true, "de-DE")]
[InlineData("* * * * 0,6", "8/13/2018 10:59 pm", false, "bo-IN")]
[InlineData("* * * * 0,6", "8/18/2018 10:59 pm", true, "teo-KE")]
[InlineData("* * * * 2-4", "8/14/2018 10:59 pm", true, "es-ES")]
[InlineData("* * * * 2-4", "8/15/2018 10:59 pm", true, "th-TH")]
[InlineData("* * * * 2-4", "8/16/2018 10:59 pm", true, "th-TH")]
[InlineData("* * * * 2-4", "8/17/2018 10:59 pm", false, "th-TH")]
// Mixed
[InlineData("00 01 * * *", "8/14/2018 1:00 am", true, "cs-CZ")]
[InlineData("00 01 * * *", "8/14/2018 1:01 am", false, "th-TH")]
[InlineData("05 01 * * *", "8/14/2018 1:05 am", true, "fr-FR")]
[InlineData("05 01 * * *", "8/14/2018 1:06 am", false, "pt-BR")]
[InlineData("05 01 * * *", "8/14/2018 1:05 pm", false, "de-DE")]
[InlineData("00 00 01 * *", "8/1/2018 12:00 am", true, "bo-IN")]
[InlineData("00 00 01 * *", "8/2/2018 12:00 am", false, "teo-KE")]
[InlineData("00 00 01 02 *", "8/1/2018 12:00 am", false, "es-ES")]
[InlineData("00 00 01 02 *", "2/1/2018 12:00 am", true, "th-TH")]
[InlineData("00 00 * * 0", "8/19/2018 12:00 am", true, "th-TH")]
[InlineData("00 00 * * 0", "8/20/2018 12:00 am", false, "th-TH")]
[InlineData("00 00 */2 * *", "8/2/2018 12:00 am", true, "th-TH")]
[InlineData("00 00 */2 * *", "8/12/2018 12:00 am", true, "th-TH")]
[InlineData("00 00 */2 * *", "8/3/2018 12:00 am", false, "th-TH")]
[InlineData("00 00 */2 * *", "8/13/2018 12:00 am", false, "th-TH")]
public async Task ScheduledEventCronWithCulture(string cronExpression, string dateString, bool shouldRun, string culture)
{
// Remember current culture in order to clean up
var prevCulture = Thread.CurrentThread.CurrentCulture;

try
{
// Set culture
Thread.CurrentThread.CurrentCulture = new CultureInfo(culture, false);

var scheduler = new Scheduler(new InMemoryMutex(), new ServiceScopeFactoryStub(), new DispatcherStub());
bool taskRan = false;

scheduler.Schedule(() => taskRan = true).Cron(cronExpression);

await scheduler.RunAtAsync(DateTime.ParseExact(dateString, "M/d/yyyy h:mm tt", CultureInfo.InvariantCulture));

Assert.Equal(shouldRun, taskRan);
}
finally
{
// Revert to previous culture
Thread.CurrentThread.CurrentCulture = prevCulture;
}
}
}
}
32 changes: 6 additions & 26 deletions Src/UnitTests/CoravelUnitTests/Scheduling/IntervalTests/SchedulerHourlyTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
using System.Globalization;
using System.Threading;
using System.Threading.Tasks;
using Coravel.Scheduling.Schedule;
using Coravel.Scheduling.Schedule.Mutex;
Expand All @@ -20,7 +18,6 @@ public class SchedulerHourlyTests
[InlineData(4, 21, 0, true)]
[InlineData(5, 23, 0, true)]
[InlineData(6, 1, 0, true)]
[InlineData(7, 1, 0, true, "th-TH")]
// Should not run
[InlineData(0, 0, 1, false)]
[InlineData(1, 4, 12, false)]
Expand All @@ -43,34 +40,17 @@ public class SchedulerHourlyTests
[InlineData(4, 21, 45, false)]
[InlineData(5, 23, 55, false)]
[InlineData(6, 1, 1, false)]
[InlineData(7, 1, 1, false, "th-TH")] // Try with different culture since it affects IndexOf calls

public async Task ValidHourly(int day, int hour, int minute, bool shouldRun, string culture = null)
public async Task ValidHourly(int day, int hour, int minute, bool shouldRun)
{
// Remember current culture in order to clean up
var prevCulture = Thread.CurrentThread.CurrentCulture;
var scheduler = new Scheduler(new InMemoryMutex(), new ServiceScopeFactoryStub(), new DispatcherStub());
bool taskRan = false;

try
{
// Set culture if needed
if (culture != null)
Thread.CurrentThread.CurrentCulture = new CultureInfo(culture, false);
scheduler.Schedule(() => taskRan = true).Hourly();

var scheduler = new Scheduler(new InMemoryMutex(), new ServiceScopeFactoryStub(), new DispatcherStub());
bool taskRan = false;
await RunScheduledTasksFromDayHourMinutes(scheduler, day, hour, minute);

scheduler.Schedule(() => taskRan = true).Hourly();

await RunScheduledTasksFromDayHourMinutes(scheduler, day, hour, minute);

Assert.Equal(shouldRun, taskRan);
}
finally
{
// Revert to previous culture if it has been changed
if (culture != null)
Thread.CurrentThread.CurrentCulture = prevCulture;
}
Assert.Equal(shouldRun, taskRan);
}
}
}

0 comments on commit a12031a

Please sign in to comment.