Skip to content

Commit 82b617c

Browse files
linkdotnetlinkdotnet
committed
refactor: Simplify test setup
1 parent 4e751d7 commit 82b617c

File tree

4 files changed

+16
-21
lines changed

4 files changed

+16
-21
lines changed

‎src/LinkDotNet.NCronJob/Scheduler/CronScheduler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
3838
while (await tickTimer.WaitForNextTickAsync(stoppingToken).ConfigureAwait(false))
3939
{
4040
// We don't want to await jobs explicitly because that
41-
// could interfere with other job runs)
41+
// could interfere with other job runs
4242
RunActiveJobs(runs, stoppingToken);
4343
runs = GetNextJobRuns();
4444
}

‎tests/NCronJob.Tests/NCronJobIntegrationTests.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public sealed class NCronJobIntegrationTests : JobIntegrationBase
1212
[Fact]
1313
public async Task CronJobThatIsScheduledEveryMinuteShouldBeExecuted()
1414
{
15-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
15+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
1616
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
1717
ServiceCollection.AddNCronJob();
1818
ServiceCollection.AddCronJob<SimpleJob>(p => p.CronExpression = "* * * * *");
@@ -28,7 +28,7 @@ public async Task CronJobThatIsScheduledEveryMinuteShouldBeExecuted()
2828
[Fact]
2929
public async Task AdvancingTheWholeTimeShouldHaveTenEntries()
3030
{
31-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider(TimeSpan.FromMinutes(1));
31+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
3232
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
3333
ServiceCollection.AddNCronJob();
3434
ServiceCollection.AddCronJob<SimpleJob>(p => p.CronExpression = "* * * * *");
@@ -44,7 +44,7 @@ public async Task AdvancingTheWholeTimeShouldHaveTenEntries()
4444
[Fact]
4545
public async Task EachJobRunHasItsOwnScope()
4646
{
47-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
47+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
4848
var storage = new Storage();
4949
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
5050
ServiceCollection.AddSingleton(storage);
@@ -65,7 +65,7 @@ public async Task EachJobRunHasItsOwnScope()
6565
[Fact]
6666
public async Task ExecuteAnInstantJob()
6767
{
68-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
68+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
6969
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
7070
ServiceCollection.AddNCronJob();
7171
ServiceCollection.AddCronJob<SimpleJob>();
@@ -82,7 +82,7 @@ public async Task ExecuteAnInstantJob()
8282
[Fact]
8383
public async Task CronJobShouldPassDownParameter()
8484
{
85-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
85+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
8686
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
8787
ServiceCollection.AddNCronJob();
8888
ServiceCollection.AddCronJob<ParameterJob>(p =>
@@ -102,7 +102,7 @@ public async Task CronJobShouldPassDownParameter()
102102
[Fact]
103103
public async Task InstantJobShouldGetParameter()
104104
{
105-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
105+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
106106
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
107107
ServiceCollection.AddNCronJob();
108108
ServiceCollection.AddCronJob<ParameterJob>();
@@ -119,7 +119,7 @@ public async Task InstantJobShouldGetParameter()
119119
[Fact]
120120
public async Task CronJobThatIsScheduledEverySecondShouldBeExecuted()
121121
{
122-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
122+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
123123
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
124124
ServiceCollection.AddNCronJob(p => p.EnableSecondPrecision = true);
125125
ServiceCollection.AddCronJob<SimpleJob>(p => p.CronExpression = "* * * * * *");
@@ -135,7 +135,7 @@ public async Task CronJobThatIsScheduledEverySecondShouldBeExecuted()
135135
[Fact]
136136
public async Task LongRunningJobShouldNotBlockSchedulerWithIsolationLevelTask()
137137
{
138-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
138+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
139139
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
140140
ServiceCollection.AddNCronJob();
141141
ServiceCollection.AddCronJob<LongRunningJob>(p =>
@@ -156,7 +156,7 @@ public async Task LongRunningJobShouldNotBlockSchedulerWithIsolationLevelTask()
156156
[Fact]
157157
public async Task LongRunningJobBlocksSchedulerWithoutIsolationLevelTask()
158158
{
159-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
159+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
160160
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
161161
ServiceCollection.AddNCronJob();
162162
ServiceCollection.AddCronJob<LongRunningJob>(p => p.CronExpression = "* * * * *");

‎tests/NCronJob.Tests/NCronJobNotificationHandlerTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class NCronJobNotificationHandlerTests : JobIntegrationBase
1111
[Fact]
1212
public async Task ShouldCallNotificationHandlerWhenJobIsDone()
1313
{
14-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
14+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
1515
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
1616
ServiceCollection.AddNCronJob();
1717
ServiceCollection.AddCronJob<SimpleJob>(p => p.CronExpression = "* * * * *");
@@ -28,7 +28,7 @@ public async Task ShouldCallNotificationHandlerWhenJobIsDone()
2828
[Fact]
2929
public async Task ShouldPassDownExceptionToNotificationHandler()
3030
{
31-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
31+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
3232
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
3333
ServiceCollection.AddNCronJob();
3434
ServiceCollection.AddCronJob<ExceptionJob>(p => p.CronExpression = "* * * * *");
@@ -45,7 +45,7 @@ public async Task ShouldPassDownExceptionToNotificationHandler()
4545
[Fact]
4646
public async Task HandlerThatThrowsExceptionShouldNotInfluenceOtherHandlers()
4747
{
48-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
48+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
4949
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
5050
ServiceCollection.AddNCronJob();
5151
ServiceCollection.AddCronJob<SimpleJob>(p => p.CronExpression = "* * * * *");
@@ -63,7 +63,7 @@ public async Task HandlerThatThrowsExceptionShouldNotInfluenceOtherHandlers()
6363
[Fact]
6464
public async Task HandlerThatThrowsExceptionInAsyncPartShouldNotInfluenceOtherHandlers()
6565
{
66-
var fakeTimer = TimeProviderFactory.GetAutoTickingTimeProvider();
66+
var fakeTimer = TimeProviderFactory.GetTimeProvider();
6767
ServiceCollection.AddSingleton<TimeProvider>(fakeTimer);
6868
ServiceCollection.AddNCronJob();
6969
ServiceCollection.AddCronJob<SimpleJob>(p => p.CronExpression = "* * * * *");

‎tests/NCronJob.Tests/TimeProviderFactory.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@ namespace NCronJob.Tests;
44

55
internal static class TimeProviderFactory
66
{
7-
public static ManualTimeProvider GetAutoTickingTimeProvider(TimeSpan? advanceAmount = null)
7+
public static ManualTimeProvider GetTimeProvider()
88
{
9-
var autoAdvanceBehavior = new AutoAdvanceBehavior
10-
{
11-
TimestampAdvanceAmount = advanceAmount ?? TimeSpan.FromSeconds(1),
12-
};
13-
var fakeTimer = new ManualTimeProvider { AutoAdvanceBehavior = autoAdvanceBehavior };
14-
return fakeTimer;
9+
return new ManualTimeProvider();
1510
}
1611
}

0 commit comments

Comments
 (0)