Skip to content

Commit d790eb2

Browse files
committed
Refactor tests
1 parent a2a7e13 commit d790eb2

File tree

4 files changed

+41
-34
lines changed

4 files changed

+41
-34
lines changed

IntegrationEngine.Model.Tests/TriggerPropertyExtensionTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,29 @@ public void ShouldReturnUtcTimeZoneIfTimeZoneIdDoesNotExist()
6464
public void ShouldReturnHumanReadableCronSchedule()
6565
{
6666
var expected = "Every minute";
67-
string timeZoneId = "* * * * *";
67+
string cronExpression = "* * * * *";
6868

69-
var result = timeZoneId.GetHumanReadableCronSchedule();
69+
var result = cronExpression.GetHumanReadableCronSchedule();
7070

7171
Assert.That(result, Is.EqualTo(expected));
7272
}
7373

7474
[Test]
7575
public void ShouldReturnEmptyStringIfCronExpressionIsNull()
7676
{
77-
string timeZoneId = null;
77+
string cronExpression = null;
7878

79-
var result = timeZoneId.GetHumanReadableCronSchedule();
79+
var result = cronExpression.GetHumanReadableCronSchedule();
8080

8181
Assert.That(result, Is.EqualTo(String.Empty));
8282
}
8383

8484
[Test]
8585
public void ShouldReturnEmptyStringIfCronExpressionIsInvalidString()
8686
{
87-
string timeZoneId = "foo";
87+
string cronExpression = "foo";
8888

89-
var result = timeZoneId.GetTimeZoneInfo();
89+
var result = cronExpression.GetTimeZoneInfo();
9090

9191
Assert.That(result, Is.EqualTo(TimeZoneInfo.Utc));
9292
}

IntegrationEngine.Tests/IntegrationEngine.Tests.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@
119119
<Project>{7D49353D-A68C-4ACA-A6A5-40B1C314C30E}</Project>
120120
<Name>IntegrationEngine</Name>
121121
</ProjectReference>
122+
<ProjectReference Include="..\UnitTesting\UnitTesting.csproj">
123+
<Project>{3a6e4fab-025b-450c-a286-911bad1f8e05}</Project>
124+
<Name>UnitTesting</Name>
125+
</ProjectReference>
122126
</ItemGroup>
123127
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
124128
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

IntegrationEngine.Tests/IntegrationJobFixture.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ namespace IntegrationEngine.Tests
99
{
1010
public class IntegrationJobFixture : IIntegrationJob
1111
{
12+
public static Type Type { get { return typeof(IntegrationJobFixture); } }
13+
public static string FullName { get { return Type.FullName; } }
1214
public void Run()
13-
{}
15+
{}
1416
}
1517
}

IntegrationEngine.Tests/Scheduler/EngineSchedulerTest.cs

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,49 @@
55
using Quartz.Impl;
66
using System;
77
using System.Collections.Generic;
8+
using UnitTesting;
89

910
namespace IntegrationEngine.Tests.Scheduler
1011
{
11-
public class EngineSchedulerTest
12+
public class EngineSchedulerTest : TestBase<EngineScheduler>
1213
{
13-
[Test]
14-
public void ShouldDeleteTrigger()
14+
public CronTrigger CronTrigger { get; set; }
15+
[SetUp]
16+
public void SetUp()
1517
{
16-
var jobType = typeof(IntegrationJobFixture);
17-
var subject = new EngineScheduler() {
18-
IntegrationJobTypes = new List<Type>() { jobType }
19-
};
20-
var trigger = new CronTrigger() {
18+
CronTrigger = new CronTrigger() {
2119
Id = "one",
22-
JobType = jobType.FullName
20+
JobType = IntegrationJobFixture.FullName,
21+
CronExpressionString = "* * * * * ?",
2322
};
24-
var scheduler = new Mock<IScheduler>();
25-
scheduler.Setup(x => x.UnscheduleJob(It.Is<TriggerKey>(y => y.Name == trigger.Id &&
26-
y.Group == trigger.JobType))).Returns(true);
27-
subject.Scheduler = scheduler.Object;
23+
Subject.IntegrationJobTypes = new List<Type>() { IntegrationJobFixture.Type };
24+
Subject.Scheduler = StdSchedulerFactory.GetDefaultScheduler();
25+
}
26+
27+
[Test]
28+
public void ShouldScheduleCronTriggerWithoutAnExceptionThrown()
29+
{
30+
Subject.ScheduleJobWithCronTrigger(CronTrigger);
31+
}
2832

29-
var result = subject.DeleteTrigger(trigger);
33+
[Test]
34+
public void ShouldDeleteTrigger()
35+
{
36+
//var scheduler = new Mock<IScheduler>();
37+
//scheduler.Setup(x => x.UnscheduleJob(It.Is<TriggerKey>(y => y.Name == trigger.Id &&
38+
// y.Group == trigger.JobType))).Returns(true);
39+
//Subject.Scheduler = scheduler.Object;
40+
Subject.ScheduleJobWithCronTrigger(CronTrigger);
41+
42+
var result = Subject.DeleteTrigger(CronTrigger);
3043

3144
Assert.That(result, Is.True);
3245
}
3346

3447
[Test]
3548
public void ShouldReturnFalseIfATriggerThatIsNotScheduledIsDeleted()
3649
{
37-
var jobType = typeof(IntegrationJobFixture);
38-
var subject = new EngineScheduler() {
39-
IntegrationJobTypes = new List<Type>() { jobType },
40-
Scheduler = StdSchedulerFactory.GetDefaultScheduler(),
41-
};
42-
var trigger = new CronTrigger()
43-
{
44-
Id = "one",
45-
JobType = jobType.FullName
46-
};
47-
var scheduler = StdSchedulerFactory.GetDefaultScheduler();
48-
49-
var result = subject.DeleteTrigger(trigger);
50+
var result = Subject.DeleteTrigger(CronTrigger);
5051

5152
Assert.That(result, Is.False);
5253
}

0 commit comments

Comments
 (0)