Skip to content

Commit

Permalink
more robust tests + cleanup (#423)
Browse files Browse the repository at this point in the history 
* more robust tests + cleanup

* published Coravel 6.0.1
  • Loading branch information
@jamesmh
jamesmh authored Dec 19, 2024
1 parent c13f2c0 commit 04df9a6
Show file tree
Hide file tree
Showing 2 changed files with 123 additions and 123 deletions.
2 changes: 1 addition & 1 deletion Src/Coravel/Coravel.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>.net6.0</TargetFramework>
<PackageId>Coravel</PackageId>
<Version>6.0.0</Version>
<Version>6.0.1</Version>
<Authors>James Hickey</Authors>
<Company>-</Company>
<Title>Coravel</Title>
Expand Down
244 changes: 122 additions & 122 deletions Src/UnitTests/CoravelUnitTests/Scheduling/IntervalTests/SchedulerCronTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,141 +139,141 @@ public async Task ScheduledEventCron(string cronExpression, string dateString, b

[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")]
[InlineData("* * * * *", "1/1/2018 12:00 am", true)]
[InlineData("* * * * *", "1/1/2018 12:01 am", true)]
[InlineData("* * * * *", "1/1/2018 1:59 am", true)]
[InlineData("* * * * *", "1/1/2018 6:22 pm", true)]
// 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")]
[InlineData("05 * * * *", "1/1/2018 6:04 pm", false)]
[InlineData("05 * * * *", "1/1/2018 6:05 pm", true)]
[InlineData("05 * * * *", "1/1/2018 6:06 pm", false)]
[InlineData("05,07 * * * *", "1/1/2018 1:05 am", true)]
[InlineData("05,07 * * * *", "1/1/2018 1:06 am", false)]
[InlineData("05,07 * * * *", "1/1/2018 1:07 am", true)]
[InlineData("22-25 * * * *", "1/1/2018 5:21 am", false)]
[InlineData("22-25 * * * *", "1/1/2018 5:22 am", true)]
[InlineData("22-25 * * * *", "1/1/2018 5:23 am", true)]
[InlineData("22-25 * * * *", "1/1/2018 5:25 am", true)]
[InlineData("22-25 * * * *", "1/1/2018 5:26 am", false)]
[InlineData("*/5 * * * *", "8/14/2018 5:00 am", true)]
[InlineData("*/5 * * * *", "8/14/2018 10:05 am", true)]
[InlineData("*/5 * * * *", "8/14/2018 10:15 am", true)]
[InlineData("*/5 * * * *", "8/14/2018 5:01 am", false)]
[InlineData("*/5 * * * *", "8/14/2018 10:14 am", false)]
[InlineData("*/5 * * * *", "8/14/2018 10:16 am", false)]
[InlineData("*/2 * * * *", "8/14/2018 2:00 am", true)]
[InlineData("*/2 * * * *", "8/14/2018 4:02 am", true)]
[InlineData("*/2 * * * *", "8/14/2018 10:54 am", true)]
[InlineData("*/2 * * * *", "8/14/2018 12:00 am", true)]
[InlineData("*/2 * * * *", "8/14/2018 2:01 am", false)]
[InlineData("*/2 * * * *", "8/14/2018 4:03 am", false)]
[InlineData("*/2 * * * *", "8/14/2018 10:55 am", false)]
[InlineData("*/2 * * * *", "8/14/2018 12:13 am", false)]
// 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")]
[InlineData("* 05 * * *", "1/1/2018 4:04 am", false)]
[InlineData("* 05 * * *", "1/1/2018 5:05 am", true)]
[InlineData("* 5 * * *", "1/1/2018 6:00 pm", false)]
[InlineData("* 5-7 * * *", "1/1/2018 5:33 am", true)]
[InlineData("* 5-7 * * *", "1/1/2018 6:33 am", true)]
[InlineData("* 5-7 * * *", "1/1/2018 7:33 am", true)]
[InlineData("* 20,22 * * *", "1/1/2018 11:00 pm", false)]
[InlineData("* 20,22 * * *", "1/1/2018 11:59 pm", false)]
[InlineData("* 20,22 * * *", "1/1/2018 10:59 pm", true)]
[InlineData("* */2 * * *", "1/1/2018 4:04 am", true)]
[InlineData("* */2 * * *", "1/1/2018 10:04 am", true)]
[InlineData("* */2 * * *", "1/1/2018 12:04 pm", true)]
[InlineData("* */2 * * *", "1/1/2018 5:04 am", false)]
[InlineData("* */2 * * *", "1/1/2018 11:04 am", false)]
[InlineData("* */2 * * *", "1/1/2018 9:04 pm", false)]
[InlineData("* */3 * * *", "1/1/2018 3:04 am", true)]
[InlineData("* */3 * * *", "1/1/2018 9:04 am", true)]
[InlineData("* */3 * * *", "1/1/2018 12:04 pm", true)]
[InlineData("* */3 * * *", "1/1/2018 1:04 am", false)]
[InlineData("* */3 * * *", "1/1/2018 5:04 am", false)]
[InlineData("* */3 * * *", "1/1/2018 11:04 pm", false)]
// 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")]
[InlineData("* * 11 * *", "1/11/2018 10:59 pm", true)]
[InlineData("* * 11 * *", "1/12/2018 10:59 pm", false)]
[InlineData("* * 11,13,15 * *", "1/11/2018 10:59 pm", true)]
[InlineData("* * 11,13,15 * *", "1/12/2018 10:59 pm", false)]
[InlineData("* * 11,13,15 * *", "1/13/2018 10:59 pm", true)]
[InlineData("* * 11,13,15 * *", "1/14/2018 10:59 pm", false)]
[InlineData("* * 11,13,15 * *", "1/15/2018 10:59 pm", true)]
[InlineData("* * 25-27 * *", "1/24/2018 10:59 pm", false)]
[InlineData("* * 25-27 * *", "1/25/2018 10:59 pm", true)]
[InlineData("* * 25-27 * *", "1/26/2018 10:59 pm", true)]
[InlineData("* * 25-27 * *", "1/27/2018 10:59 pm", true)]
[InlineData("* * 25-27 * *", "1/28/2018 10:59 pm", false)]
// 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")]
[InlineData("* * * 5 *", "4/25/2018 10:59 pm", false)]
[InlineData("* * * 5 *", "5/25/2018 10:59 pm", true)]
[InlineData("* * * 5 *", "6/25/2018 10:59 pm", false)]
[InlineData("* * * 5-7 *", "4/25/2018 10:59 pm", false)]
[InlineData("* * * 5-7 *", "5/25/2018 10:59 pm", true)]
[InlineData("* * * 5-7 *", "6/25/2018 10:59 pm", true)]
[InlineData("* * * 5-7 *", "7/25/2018 10:59 pm", true)]
[InlineData("* * * 5-7 *", "8/25/2018 10:59 pm", false)]
[InlineData("* * * 7,11 *", "6/25/2018 10:59 pm", false)]
[InlineData("* * * 7,11 *", "7/25/2018 10:59 pm", true)]
[InlineData("* * * 7,11 *", "8/25/2018 10:59 pm", false)]
[InlineData("* * * 7,11 *", "10/25/2018 10:59 pm", false)]
[InlineData("* * * 7,11 *", "11/25/2018 10:59 pm", true)]
[InlineData("* * * 7,11 *", "12/25/2018 10:59 pm", false)]
[InlineData("* * * */5 *", "5/25/2018 10:59 pm", true)]
[InlineData("* * * */5 *", "10/25/2018 10:59 pm", true)]
[InlineData("* * * */5 *", "4/25/2018 10:59 pm", false)]
[InlineData("* * * */5 *", "11/25/2018 10:59 pm", false)]
// 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")]
[InlineData("* * * * 0", "8/12/2018 10:59 pm", true)]
[InlineData("* * * * 0", "8/13/2018 10:59 pm", false)]
[InlineData("* * * * 0", "8/18/2018 10:59 pm", false)]
[InlineData("* * * * 0", "8/19/2018 10:59 pm", true)]
[InlineData("* * * * 0,6", "8/12/2018 10:59 pm", true)]
[InlineData("* * * * 0,6", "8/13/2018 10:59 pm", false)]
[InlineData("* * * * 0,6", "8/18/2018 10:59 pm", true)]
[InlineData("* * * * 2-4", "8/14/2018 10:59 pm", true)]
[InlineData("* * * * 2-4", "8/15/2018 10:59 pm", true)]
[InlineData("* * * * 2-4", "8/16/2018 10:59 pm", true)]
[InlineData("* * * * 2-4", "8/17/2018 10:59 pm", false)]
// 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)
[InlineData("00 01 * * *", "8/14/2018 1:00 am", true)]
[InlineData("00 01 * * *", "8/14/2018 1:01 am", false)]
[InlineData("05 01 * * *", "8/14/2018 1:05 am", true)]
[InlineData("05 01 * * *", "8/14/2018 1:06 am", false)]
[InlineData("05 01 * * *", "8/14/2018 1:05 pm", false)]
[InlineData("00 00 01 * *", "8/1/2018 12:00 am", true)]
[InlineData("00 00 01 * *", "8/2/2018 12:00 am", false)]
[InlineData("00 00 01 02 *", "8/1/2018 12:00 am", false)]
[InlineData("00 00 01 02 *", "2/1/2018 12:00 am", true)]
[InlineData("00 00 * * 0", "8/19/2018 12:00 am", true)]
[InlineData("00 00 * * 0", "8/20/2018 12:00 am", false)]
[InlineData("00 00 */2 * *", "8/2/2018 12:00 am", true)]
[InlineData("00 00 */2 * *", "8/12/2018 12:00 am", true)]
[InlineData("00 00 */2 * *", "8/3/2018 12:00 am", false)]
[InlineData("00 00 */2 * *", "8/13/2018 12:00 am", false)]
public async Task ScheduledEventCronWithCulture(string cronExpression, string dateString, bool shouldRun)
{
// Remember current culture in order to clean up
var prevCulture = Thread.CurrentThread.CurrentCulture;

try
foreach(var culture in new string[] { "th-TH", "es-ES", "teo-KE", "bo-IN", "de-DE", "pt-BR", "fr-FR", "cs-CZ" })
{
// Set culture
Thread.CurrentThread.CurrentCulture = new CultureInfo(culture, false);
var prevCulture = Thread.CurrentThread.CurrentCulture;

var scheduler = new Scheduler(new InMemoryMutex(), new ServiceScopeFactoryStub(), new DispatcherStub());
bool taskRan = false;
try
{
Thread.CurrentThread.CurrentCulture = new CultureInfo(culture, false);

scheduler.Schedule(() => taskRan = true).Cron(cronExpression);
var scheduler = new Scheduler(new InMemoryMutex(), new ServiceScopeFactoryStub(), new DispatcherStub());
bool taskRan = false;

await scheduler.RunAtAsync(DateTime.ParseExact(dateString, "M/d/yyyy h:mm tt", CultureInfo.InvariantCulture));
scheduler.Schedule(() => taskRan = true).Cron(cronExpression);

Assert.Equal(shouldRun, taskRan);
}
finally
{
// Revert to previous culture
await scheduler.RunAtAsync(DateTime.ParseExact(dateString, "M/d/yyyy h:mm tt", CultureInfo.InvariantCulture));

Assert.Equal(shouldRun, taskRan);
}
finally
{
Thread.CurrentThread.CurrentCulture = prevCulture;
}
}
}
}
Expand Down

0 comments on commit 04df9a6

Please sign in to comment.