Skip to content

Commit 1621e35

Browse files
ethanhannethanhann
committed
Refactor tests and add resharper settings
1 parent 552ede1 commit 1621e35

File tree

11 files changed

+44
-31
lines changed

11 files changed

+44
-31
lines changed

‎IntegrationEngine.Core.Tests/IntegrationEngine.Core.Tests.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
<ConsolePause>false</ConsolePause>
3131
</PropertyGroup>
3232
<ItemGroup>
33+
<Reference Include="RabbitMQ.Client, Version=3.4.3.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
34+
<SpecificVersion>False</SpecificVersion>
35+
<HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
36+
</Reference>
3337
<Reference Include="System" />
3438
<Reference Include="nunit.framework">
3539
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -57,6 +61,7 @@
5761
</Reference>
5862
</ItemGroup>
5963
<ItemGroup>
64+
<Compile Include="MessageQueue\RabbitMQClientTest.cs" />
6065
<Compile Include="Properties\AssemblyInfo.cs" />
6166
<Compile Include="Storage\ElasticsearchRepositoryTest.cs" />
6267
<Compile Include="Mail\MailClientTest.cs" />
@@ -77,6 +82,7 @@
7782
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
7883
</ItemGroup>
7984
<ItemGroup>
85+
<None Include="app.config" />
8086
<None Include="packages.config" />
8187
</ItemGroup>
8288
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

‎IntegrationEngine.Core.Tests/Mail/MailClientTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public void Setup()
2626
[Test]
2727
public void ShouldLogExceptionAndReturnFalseIfMailServerIsNotAvailable()
2828
{
29-
MockLog.Setup(x => x.Error(It.IsAny<SocketException>()));
29+
MockLog.Setup(x => x.Error(It.IsAny<Exception>()));
3030

3131
var actual = Subject.IsServerAvailable();
3232

3333
Assert.That(actual, Is.False);
34-
MockLog.Verify(x => x.Error(It.IsAny<SocketException>()));
34+
MockLog.Verify(x => x.Error(It.IsAny<Exception>()));
3535
}
3636

3737
// @TODO Do not mock tcp client, instead test with listener or real mail server.

IntegrationEngine.Tests/MessageQueue/RabbitMQClientTest.cs renamed to IntegrationEngine.Core.Tests/MessageQueue/RabbitMQClientTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using BeekmanLabs.UnitTesting;
22
using Common.Logging;
3-
using IntegrationEngine.Configuration;
4-
using IntegrationEngine.MessageQueue;
3+
using IntegrationEngine.Core.Configuration;
4+
using IntegrationEngine.Core.MessageQueue;
55
using Moq;
66
using NUnit.Framework;
77
using System;
@@ -10,7 +10,7 @@
1010
using IntegrationEngine.Core.MessageQueue;
1111
using IntegrationEngine.Core.Configuration;
1212

13-
namespace IntegrationEngine.Tests.MessageQueue
13+
namespace IntegrationEngine.Core.Tests.MessageQueue
1414
{
1515
public class RabbitMQClientTest : TestBase<RabbitMQClient>
1616
{

‎IntegrationEngine.Core.Tests/app.config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

‎IntegrationEngine.Core.Tests/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
<package id="NEST" version="1.4.0" targetFramework="net45" />
99
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1010
<package id="NUnit" version="2.6.4" targetFramework="net45" />
11+
<package id="RabbitMQ.Client" version="3.4.3" targetFramework="net45" />
1112
</packages>

‎IntegrationEngine.Core/Mail/MailClient.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public bool IsServerAvailable()
6060
}
6161
}
6262
}
63-
catch (SocketException exception)
63+
catch (Exception exception)
6464
{
6565
Log.Error(exception);
6666
isAvailable = false;

‎IntegrationEngine.Tests/EngineHostConfigurationTest.cs‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using BeekmanLabs.UnitTesting;
22
using Common.Logging;
33
using IntegrationEngine.Api;
4-
using IntegrationEngine.Core.Mail;
54
using IntegrationEngine.Core.MessageQueue;
65
using IntegrationEngine.Core.R;
76
using IntegrationEngine.Core.Storage;
@@ -73,9 +72,9 @@ public void ShouldSetupMessageQueueListener()
7372
{
7473
Subject.LoadConfiguration();
7574

76-
Subject.SetupAsyncListener();
75+
Subject.SetupThreadedListenerManager();
7776

78-
Subject.Container.Resolve<IMessageQueueListener>();
77+
Subject.Container.Resolve<IThreadedListenerManager>();
7978
}
8079

8180
[Test]
@@ -110,19 +109,14 @@ public void ShouldSetupRScriptRunner()
110109
}
111110

112111
[Test]
113-
public void ShouldShutdownSchedulerAndDisposeOfMessageQueueListener()
112+
public void ShouldDisposeOfResources()
114113
{
115-
var mockEngineScheduler = new Mock<IEngineScheduler>();
116-
mockEngineScheduler.Setup(x => x.Dispose());
117-
UnityContainer.RegisterInstance<IEngineScheduler>(mockEngineScheduler.Object);
118-
var mockMessageQueueListener = new Mock<IMessageQueueListener>();
119-
mockMessageQueueListener.Setup(x => x.Dispose());
120-
UnityContainer.RegisterInstance<IMessageQueueListener>(mockMessageQueueListener.Object);
121-
114+
var mockWebApiApplication = new Mock<IWebApiApplication>();
115+
Subject.WebApiApplication = mockWebApiApplication.Object;
116+
122117
Subject.Dispose();
123118

124-
mockEngineScheduler.Verify(x => x.Dispose(), Times.Once);
125-
mockMessageQueueListener.Verify(x => x.Dispose(), Times.Once);
119+
mockWebApiApplication.Verify(x => x.Dispose(), Times.Once);
126120
}
127121
}
128122
}

‎IntegrationEngine.Tests/IntegrationEngine.Tests.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<Compile Include="IntegrationJobStub.cs" />
115115
<Compile Include="Api\TriggerControllerBaseTest.cs" />
116116
<Compile Include="Api\TriggerStub.cs" />
117-
<Compile Include="MessageQueue\RabbitMQClientTest.cs" />
118117
</ItemGroup>
119118
<ItemGroup>
120119
<None Include="..\configuration\IntegrationEngine.json">
@@ -163,7 +162,5 @@
163162
<Target Name="AfterBuild">
164163
</Target>
165164
-->
166-
<ItemGroup>
167-
<Folder Include="MessageQueue\" />
168-
</ItemGroup>
165+
<ItemGroup />
169166
</Project>

‎IntegrationEngine.sln.DotSettings‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
3+
<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>

‎IntegrationEngine/Api/WebApiApplication.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public void Start()
2020

2121
public void Dispose()
2222
{
23-
webApi.Dispose();
23+
if (webApi != null)
24+
webApi.Dispose();
2425
}
2526
}
2627
}

0 commit comments

Comments
 (0)