Skip to content

Commit 637261c

Browse files
ethanhannethanhann
committed
Merge branch 'develop' of github.com:ethanhann/IntegrationEngine into develop
2 parents 0d37d34 + bbdb048 commit 637261c

File tree

48 files changed

+587
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+587
-388
lines changed

‎IntegrationEngine.Client.Tests/InEngineClientTest.cs‎

Lines changed: 144 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,40 @@
11
using BeekmanLabs.UnitTesting;
2+
using IntegrationEngine.Model;
3+
using Newtonsoft.Json;
24
using NUnit.Framework;
35
using Moq;
46
using RestSharp;
57
using System;
68
using System.Net;
9+
using System.Collections.Generic;
10+
using System.Linq;
711

812
namespace IntegrationEngine.Client.Tests
913
{
1014
public class InEngineClientTest : TestBase<InEngineClient>
1115
{
16+
Mock<IRestClient> MockRestClient { get; set; }
17+
Mock<IJsonConvert> MockJsonConvert { get; set; }
18+
string ResourceStubName { get; set; }
19+
string HealthStatusName { get; set; }
20+
21+
[SetUp]
22+
public void Setup()
23+
{
24+
MockRestClient = new Mock<IRestClient>();
25+
Subject.RestClient = MockRestClient.Object;
26+
MockJsonConvert = new Mock<IJsonConvert>();
27+
Subject.JsonConvert = MockJsonConvert.Object;
28+
ResourceStubName = typeof(ResourceStub).Name;
29+
HealthStatusName = typeof(HealthStatus).Name;
30+
}
31+
1232
[Test]
1333
public void ShouldInstantiateWithDefaultApiUrl()
1434
{
15-
var expected = "http://localhost:9001/api/";
35+
var expectedApiUrl = "http://localhost:9001/api/";
36+
var expected = new Uri(expectedApiUrl);
37+
MockRestClient.SetupGet(x => x.BaseUrl).Returns(expected);
1638

1739
var actual = Subject.ApiUrl;
1840

@@ -22,16 +44,131 @@ public void ShouldInstantiateWithDefaultApiUrl()
2244
[Test]
2345
public void ShouldQueryTheHealthStatusEndpointAndReturnStatusCodeWhenPinging()
2446
{
25-
var mockRestClient = new Mock<IRestClient>();
26-
var restResponse = new RestResponse() { StatusCode = HttpStatusCode.OK};
27-
mockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == EndpointName.HealthStatus)))
28-
.Returns(restResponse);
29-
Subject.RestClient = mockRestClient.Object;
47+
var restResponse = new RestResponse() { StatusCode = HttpStatusCode.OK };
48+
MockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == HealthStatusName))).Returns(restResponse);
3049

3150
var actual = Subject.Ping();
3251

33-
mockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == EndpointName.HealthStatus)), Times.Once);
52+
MockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == HealthStatusName)), Times.Once);
3453
Assert.That(actual, Is.TypeOf(typeof(HttpStatusCode)));
3554
}
55+
56+
[Test]
57+
public void ShouldReturnHealthStatus()
58+
{
59+
var expected = new HealthStatus() {
60+
IsElasticsearchServerAvailable = true,
61+
IsMailServerAvailable = true,
62+
IsMessageQueueServerAvailable = true,
63+
};
64+
var content = JsonConvert.SerializeObject(expected);
65+
var restResponse = new RestResponse() { Content = content };
66+
MockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == HealthStatusName)))
67+
.Returns(restResponse);
68+
MockJsonConvert.Setup(x => x.DeserializeObject<HealthStatus>(content))
69+
.Returns(expected);
70+
71+
var actual = Subject.GetHealthStatus();
72+
73+
Assert.That(actual, Is.EqualTo(expected));
74+
MockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == HealthStatusName)), Times.Once);
75+
MockJsonConvert.Verify(x => x.DeserializeObject<HealthStatus>(content), Times.Once);
76+
}
77+
78+
79+
[Test]
80+
public void ShouldGetCollectionOfResourceStubs()
81+
{
82+
var expected = new List<ResourceStub>();
83+
var content = JsonConvert.SerializeObject(expected);
84+
var restResponse = new RestResponse() { Content = content };
85+
MockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == ResourceStubName)))
86+
.Returns(restResponse);
87+
MockJsonConvert.Setup(x => x.DeserializeObject<IList<ResourceStub>>(content))
88+
.Returns(expected);
89+
90+
var actual = Subject.GetCollection<ResourceStub>();
91+
92+
Assert.That(actual.ToList(), Is.EquivalentTo(expected));
93+
MockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == ResourceStubName)), Times.Once);
94+
MockJsonConvert.Verify(x => x.DeserializeObject<IList<ResourceStub>>(content), Times.Once);
95+
}
96+
97+
[Test]
98+
public void ShouldReturnResourceStubGivenAnId()
99+
{
100+
var id = "1";
101+
var resource = ResourceStubName + "/{id}";
102+
var expected = new ResourceStub();
103+
var content = JsonConvert.SerializeObject(expected);
104+
var restResponse = new RestResponse() { Content = content };
105+
MockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == resource)))
106+
.Returns(restResponse);
107+
MockJsonConvert.Setup(x => x.DeserializeObject<ResourceStub>(content))
108+
.Returns(expected);
109+
110+
var actual = Subject.Get<ResourceStub>(id);
111+
112+
Assert.That(actual, Is.EqualTo(expected));
113+
MockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == resource)), Times.Once);
114+
MockJsonConvert.Verify(x => x.DeserializeObject<ResourceStub>(content), Times.Once);
115+
}
116+
117+
[Test]
118+
public void ShouldCreateAndReturnResourceStub()
119+
{
120+
var expected = new ResourceStub();
121+
var content = JsonConvert.SerializeObject(expected);
122+
var restResponse = new RestResponse() { Content = content };
123+
MockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == ResourceStubName)))
124+
.Returns(restResponse);
125+
MockJsonConvert.Setup(x => x.DeserializeObject<ResourceStub>(content))
126+
.Returns(expected);
127+
128+
var actual = Subject.Create(expected);
129+
130+
Assert.That(actual, Is.EqualTo(expected));
131+
MockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == ResourceStubName)), Times.Once);
132+
MockJsonConvert.Verify(x => x.DeserializeObject<ResourceStub>(content), Times.Once);
133+
}
134+
135+
[Test]
136+
public void ShouldUpdateAndReturnResourceStub()
137+
{
138+
var resource = ResourceStubName + "/{id}";
139+
var expected = new ResourceStub();
140+
var content = JsonConvert.SerializeObject(expected);
141+
var restResponse = new RestResponse() { Content = content };
142+
MockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == resource)))
143+
.Returns(restResponse);
144+
MockJsonConvert.Setup(x => x.DeserializeObject<ResourceStub>(content))
145+
.Returns(expected);
146+
147+
var actual = Subject.Update(expected);
148+
149+
Assert.That(actual, Is.EqualTo(expected));
150+
MockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == resource)), Times.Once);
151+
MockJsonConvert.Verify(x => x.DeserializeObject<ResourceStub>(content), Times.Once);
152+
}
153+
154+
[Test]
155+
public void ShouldDeleteAndReturnResourceStub()
156+
{
157+
var id = "1";
158+
var resource = ResourceStubName + "/{id}";
159+
var expected = new ResourceStub();
160+
var content = JsonConvert.SerializeObject(expected);
161+
var restResponse = new RestResponse() { Content = content };
162+
MockRestClient.Setup(x => x.Execute(It.Is<RestRequest>(y => y.Resource == resource)))
163+
.Returns(restResponse);
164+
MockJsonConvert.Setup(x => x.DeserializeObject<ResourceStub>(content))
165+
.Returns(expected);
166+
167+
var actual = Subject.Delete<ResourceStub>(id);
168+
169+
Assert.That(actual, Is.EqualTo(expected));
170+
MockRestClient.Verify(x => x.Execute(It.Is<RestRequest>(y => y.Resource == resource)), Times.Once);
171+
MockJsonConvert.Verify(x => x.DeserializeObject<ResourceStub>(content), Times.Once);
172+
}
36173
}
37174
}

‎IntegrationEngine.Client.Tests/IntegrationEngine.Client.Tests.csproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<ItemGroup>
5151
<Compile Include="Properties\AssemblyInfo.cs" />
5252
<Compile Include="InEngineClientTest.cs" />
53+
<Compile Include="ResourceStub.cs" />
5354
</ItemGroup>
5455
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
5556
<ItemGroup>
@@ -60,6 +61,13 @@
6061
<Project>{F3FCB706-F0DD-46C1-B121-785757FAE9B9}</Project>
6162
<Name>IntegrationEngine.Client</Name>
6263
</ProjectReference>
64+
<ProjectReference Include="..\IntegrationEngine.Model\IntegrationEngine.Model.csproj">
65+
<Project>{0B499FE4-0BDB-4080-BCB7-F8D4CE54A4FF}</Project>
66+
<Name>IntegrationEngine.Model</Name>
67+
</ProjectReference>
68+
</ItemGroup>
69+
<ItemGroup>
70+
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
6371
</ItemGroup>
6472
<ItemGroup>
6573
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎IntegrationEngine.Client.Tests/ResourceStub.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
using IntegrationEngine.Model;
3+
4+
namespace IntegrationEngine.Client.Tests
5+
{
6+
public class ResourceStub : IHasStringId
7+
{
8+
public string Id { get; set; }
9+
}
10+
}
11+

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,19 @@
5050
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
5151
<Link>Properties\SharedAssemblyInfo.cs</Link>
5252
</Compile>
53-
<Compile Include="..\IntegrationEngine.Client\EndpointName.cs">
54-
<Link>EndpointName.cs</Link>
55-
</Compile>
5653
<Compile Include="..\IntegrationEngine.Client\IInEngineClient.cs">
5754
<Link>IInEngineClient.cs</Link>
5855
</Compile>
5956
<Compile Include="..\IntegrationEngine.Client\InEngineClient.cs">
6057
<Link>InEngineClient.cs</Link>
6158
</Compile>
6259
<Compile Include="Properties\AssemblyInfo.cs" />
60+
<Compile Include="..\IntegrationEngine.Client\IJsonConvert.cs">
61+
<Link>IJsonConvert.cs</Link>
62+
</Compile>
63+
<Compile Include="..\IntegrationEngine.Client\JsonConvertAdapter.cs">
64+
<Link>JsonConvertAdapter.cs</Link>
65+
</Compile>
6366
</ItemGroup>
6467
<ItemGroup>
6568
<None Include="packages.config" />

‎IntegrationEngine.Client/Endpoint.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
3+
namespace IntegrationEngine.Client
4+
{
5+
public enum Endpoint
6+
{
7+
CronTrigger,
8+
SimpleTrigger,
9+
JobType,
10+
LogEvent,
11+
HealthStatus,
12+
}
13+
}
14+

‎IntegrationEngine.Client/EndpointName.cs‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎IntegrationEngine.Client/IInEngineClient.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using InEngineTimeZone = IntegrationEngine.Model.TimeZone;
2-
using IntegrationEngine.Model;
1+
using IntegrationEngine.Model;
32
using System;
43
using System.Collections.Generic;
54
using System.Net;
@@ -8,7 +7,13 @@ namespace IntegrationEngine.Client
87
{
98
public interface IInEngineClient
109
{
10+
IJsonConvert JsonConvert { get; set; }
1111
HttpStatusCode Ping();
12+
IList<TItem> GetCollection<TItem>() where TItem : class;
13+
TItem Get<TItem>(string id) where TItem : class, IHasStringId;
14+
TItem Create<TItem>(TItem item);
15+
TItem Update<TItem>(TItem item) where TItem : class, IHasStringId;
16+
TItem Delete<TItem>(string id);
1217
IList<CronTrigger> GetCronTriggers();
1318
CronTrigger GetCronTriggerById(string id);
1419
CronTrigger CreateCronTrigger(CronTrigger cronTrigger);
@@ -19,7 +24,7 @@ public interface IInEngineClient
1924
SimpleTrigger CreateSimpleTrigger(SimpleTrigger simpleTrigger);
2025
SimpleTrigger UpdateSimpleTrigger(SimpleTrigger simpleTrigger);
2126
SimpleTrigger DeleteSimpleTrigger(string id);
22-
IList<InEngineTimeZone> GetTimeZones();
27+
IList<LogEvent> GetLogEvents();
2328
IList<JobType> GetJobTypes();
2429
HealthStatus GetHealthStatus();
2530
}

‎IntegrationEngine.Client/IJsonConvert.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
using System;
2+
3+
namespace IntegrationEngine.Client
4+
{
5+
public interface IJsonConvert
6+
{
7+
T DeserializeObject<T>(string value);
8+
}
9+
}
10+

0 commit comments

Comments
 (0)