Skip to content

Commit 3d0a666

Browse files
ethanhannethanhann
committed
Merge branch 'develop' of github.com:ethanhann/IntegrationEngine into develop
Conflicts: IntegrationEngine.sln
2 parents 3611fe0 + 92c8fa4 commit 3d0a666

File tree

8 files changed

+23
-35
lines changed

8 files changed

+23
-35
lines changed

‎IntegrationEngine.Client.net40/IntegrationEngine.Client.net40.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
<Compile Include="..\IntegrationEngine.Client\EndpointName.cs">
5454
<Link>EndpointName.cs</Link>
5555
</Compile>
56+
<Compile Include="..\IntegrationEngine.Client\IInEngineClient.cs">
57+
<Link>IInEngineClient.cs</Link>
58+
</Compile>
5659
<Compile Include="..\IntegrationEngine.Client\InEngineClient.cs">
5760
<Link>InEngineClient.cs</Link>
5861
</Compile>

‎IntegrationEngine.Model.Tests/IntegrationEngine.Model.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@
7070
<Project>{0B499FE4-0BDB-4080-BCB7-F8D4CE54A4FF}</Project>
7171
<Name>IntegrationEngine.Model</Name>
7272
</ProjectReference>
73-
<ProjectReference Include="..\UnitTesting\UnitTesting.csproj">
74-
<Project>{3A6E4FAB-025B-450C-A286-911BAD1F8E05}</Project>
75-
<Name>UnitTesting</Name>
76-
</ProjectReference>
7773
</ItemGroup>
7874
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7975
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎IntegrationEngine.Tests/Api/Controllers/CronTriggerControllerTest.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
using IntegrationEngine.Api.Controllers;
1+
using BeekmanLabs.UnitTesting;
2+
using IntegrationEngine.Api.Controllers;
23
using IntegrationEngine.Core.Storage;
34
using IntegrationEngine.Scheduler;
45
using Moq;
56
using NUnit.Framework;
67

78
namespace IntegrationEngine.Tests.Api.Controllers
89
{
9-
public class CronTriggerControllerTest
10+
public class CronTriggerControllerTest : TestBase<CronTriggerController>
1011
{
1112
[Test]
1213
public void ShouldScheduleJobWhenCronTriggerIsCreatedWithValidCronExpression()
1314
{
14-
var subject = new CronTriggerController();
1515
var cronExpression = "0 6 * * 1-5 ?";
1616
var jobType = "MyProject.MyIntegrationJob";
1717
var expected = new CronTrigger() {
@@ -20,12 +20,12 @@ public void ShouldScheduleJobWhenCronTriggerIsCreatedWithValidCronExpression()
2020
};
2121
var engineScheduler = new Mock<IEngineScheduler>();
2222
engineScheduler.Setup(x => x.ScheduleJobWithCronTrigger(expected));
23-
subject.EngineScheduler = engineScheduler.Object;
23+
Subject.EngineScheduler = engineScheduler.Object;
2424
var esRepository = new Mock<ESRepository<CronTrigger>>();
2525
esRepository.Setup(x => x.Insert(expected)).Returns(expected);
26-
subject.Repository = esRepository.Object;
26+
Subject.Repository = esRepository.Object;
2727

28-
subject.PostCronTrigger(expected);
28+
Subject.PostCronTrigger(expected);
2929

3030
engineScheduler.Verify(x => x
3131
.ScheduleJobWithCronTrigger(It.Is<CronTrigger>(y => y.JobType == jobType &&

‎IntegrationEngine.Tests/EngineHostConfigurationTest.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
using IntegrationEngine.Configuration;
2-
using Microsoft.Practices.Unity;
1+
using BeekmanLabs.UnitTesting;
32
using Moq;
43
using NUnit.Framework;
5-
using System;
64

75
namespace IntegrationEngine.Tests
86
{
9-
public class EngineHostConfigurationTest
7+
public class EngineHostConfigurationTest : TestBase<EngineHostConfiguration>
108
{
119
[Test]
1210
public void CanLoadConfiguration()
1311
{
14-
var subject = new EngineHostConfiguration();
1512
var container = new Mock<StubContainer>();
16-
subject.Container = container.Object;
13+
Subject.Container = container.Object;
1714

18-
subject.LoadConfiguration();
15+
Subject.LoadConfiguration();
1916

20-
Assert.IsNotNull(subject.Configuration);
17+
Assert.IsNotNull(Subject.Configuration);
2118
}
2219
}
2320
}

‎IntegrationEngine.Tests/IntegrationEngine.Tests.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
3838
<ItemGroup>
39+
<Reference Include="BeekmanLabs.UnitTesting">
40+
<HintPath>..\packages\BeekmanLabs.UnitTesting.0.0.0\lib\net45\BeekmanLabs.UnitTesting.dll</HintPath>
41+
</Reference>
3942
<Reference Include="fx.configuration">
4043
<HintPath>..\packages\fx.configuration.0.4.0\lib\net45\fx.configuration.dll</HintPath>
4144
</Reference>
@@ -116,10 +119,6 @@
116119
<Project>{7D49353D-A68C-4ACA-A6A5-40B1C314C30E}</Project>
117120
<Name>IntegrationEngine</Name>
118121
</ProjectReference>
119-
<ProjectReference Include="..\UnitTesting\UnitTesting.csproj">
120-
<Project>{3A6E4FAB-025B-450C-A286-911BAD1F8E05}</Project>
121-
<Name>UnitTesting</Name>
122-
</ProjectReference>
123122
</ItemGroup>
124123
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
125124
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎IntegrationEngine.Tests/Scheduler/EngineSchedulerTest.cs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using IntegrationEngine.Scheduler;
2-
using Moq;
1+
using BeekmanLabs.UnitTesting;
2+
using IntegrationEngine.Scheduler;
33
using NUnit.Framework;
4-
using Quartz;
54
using Quartz.Impl;
65
using System;
76
using System.Collections.Generic;
8-
using UnitTesting;
97

108
namespace IntegrationEngine.Tests.Scheduler
119
{
@@ -33,10 +31,6 @@ public void ShouldScheduleCronTriggerWithoutAnExceptionThrown()
3331
[Test]
3432
public void ShouldDeleteTrigger()
3533
{
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;
4034
Subject.ScheduleJobWithCronTrigger(CronTrigger);
4135

4236
var result = Subject.DeleteTrigger(CronTrigger);

‎IntegrationEngine.Tests/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="BeekmanLabs.UnitTesting" version="0.0.0" targetFramework="net45" />
34
<package id="Common.Logging" version="3.0.0" targetFramework="net45" />
45
<package id="Common.Logging.Core" version="3.0.0" targetFramework="net45" />
56
<package id="fx.configuration" version="0.4.0" targetFramework="net45" />

‎IntegrationEngine.sln‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.21005.1
4+
VisualStudioVersion = 12.0.31101.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEngine", "IntegrationEngine\IntegrationEngine.csproj", "{7D49353D-A68C-4ACA-A6A5-40B1C314C30E}"
77
EndProject
@@ -12,9 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
1212
.gitignore = .gitignore
1313
configuration\IntegrationEngine.json = configuration\IntegrationEngine.json
1414
configuration\IntegrationEngine.nlog.xml = configuration\IntegrationEngine.nlog.xml
15-
package.cmd = package.cmd
15+
scripts\package.cmd = scripts\package.cmd
1616
README.md = README.md
17-
release.cmd = release.cmd
17+
scripts\release.cmd = scripts\release.cmd
1818
configuration\SharedAssemblyInfo.cs = configuration\SharedAssemblyInfo.cs
1919
EndProjectSection
2020
EndProject
@@ -39,8 +39,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEngine.ConsoleCl
3939
EndProject
4040
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationEngine.Model.Tests", "IntegrationEngine.Model.Tests\IntegrationEngine.Model.Tests.csproj", "{F999051E-B715-4AB9-A3B2-0D91A896A2C2}"
4141
EndProject
42-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "UnitTesting\UnitTesting.csproj", "{3A6E4FAB-025B-450C-A286-911BAD1F8E05}"
43-
EndProject
4442
Global
4543
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4644
Debug|Any CPU = Debug|Any CPU

0 commit comments

Comments
 (0)