Add mail client tests and refactor dir structure

ethanhann · ethanhann · commit 2f830c9024e0 · 2015-02-01T02:14:37.000-05:00
diff --git a/IntegrationEngine.Core.Tests/IntegrationEngine.Core.Tests.csproj b/IntegrationEngine.Core.Tests/IntegrationEngine.Core.Tests.csproj
@@ -57,16 +57,17 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Storage\ElasticsearchRepositoryTest.cs" />
-    <Compile Include="StubElasticClient.cs" />
-    <Compile Include="StubSearchResponse.cs" />
-    <Compile Include="StubHit.cs" />
-    <Compile Include="StubGetResponse.cs" />
-    <Compile Include="StubIndexResponse.cs" />
-    <Compile Include="StubUpdateResponse.cs" />
-    <Compile Include="StubDeleteRequest.cs" />
-    <Compile Include="StubPingResponse.cs" />
-    <Compile Include="StubElasticsearchResponse.cs" />
-    <Compile Include="StubExistsResponse.cs" />
+    <Compile Include="Mail\MailClientTest.cs" />
+    <Compile Include="Storage\StubDeleteRequest.cs" />
+    <Compile Include="Storage\StubElasticClient.cs" />
+    <Compile Include="Storage\StubElasticsearchResponse.cs" />
+    <Compile Include="Storage\StubExistsResponse.cs" />
+    <Compile Include="Storage\StubGetResponse.cs" />
+    <Compile Include="Storage\StubHit.cs" />
+    <Compile Include="Storage\StubIndexResponse.cs" />
+    <Compile Include="Storage\StubPingResponse.cs" />
+    <Compile Include="Storage\StubSearchResponse.cs" />
+    <Compile Include="Storage\StubUpdateResponse.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
@@ -81,6 +82,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Storage\" />
+    <Folder Include="Mail\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/IntegrationEngine.Core.Tests/Mail/MailClientTest.cs b/IntegrationEngine.Core.Tests/Mail/MailClientTest.cs
@@ -0,0 +1,98 @@
+﻿using BeekmanLabs.UnitTesting;
+using Common.Logging;
+using IntegrationEngine.Core.Configuration;
+using IntegrationEngine.Core.Mail;
+using Moq;
+using NUnit.Framework;
+using System;
+using System.IO;
+using System.Linq.Expressions;
+using System.Net.Mail;
+using System.Net.Sockets;
+
+namespace IntegrationEngine.Core.Tests.Mail
+{
+    public class MailClientTest : TestBase<MailClient>
+    {
+        public Mock<ITcpClient> MockTcpClient { get; set; }
+        public Mock<ILog> MockLog { get; set; }
+
+        [SetUp]
+        public void Setup()
+        {
+            MockLog = new Mock<ILog>();
+            Subject.Log = MockLog.Object;
+            Subject.MailConfiguration = new MailConfiguration() {
+                HostName = "hostName",
+                Port = 0,
+            };
+            MockTcpClient = new Mock<ITcpClient>();
+            Subject.TcpClient = MockTcpClient.Object;
+        }
+
+        [Test]
+        public void ShouldLogExceptionAndReturnFalseIfMailServerIsNotAvailable()
+        {
+            MockTcpClient.Setup(x => x.Connect(
+                Subject.MailConfiguration.HostName,
+                Subject.MailConfiguration.Port))
+                .Throws(new SocketException());
+            MockLog.Setup(x => x.Error(It.IsAny<SocketException>()));
+
+            var actual = Subject.IsServerAvailable();
+           
+            Assert.That(actual, Is.False);
+            MockLog.Verify(x => x.Error(It.IsAny<SocketException>()));
+        }
+
+        [Test]
+        public void ShouldReturnTrueIfMailServerIsAvailable()
+        {
+            var expectedText = "Mail server status: Available";
+            MockLog.Setup(x => x.Debug(expectedText));
+            MockTcpClient.Setup(x => x.Connect(
+                Subject.MailConfiguration.HostName,
+                Subject.MailConfiguration.Port));
+            var stream = new MemoryStream();
+            var responseInBytes = System.Text.Encoding.UTF8.GetBytes("OK");
+            stream.Write(responseInBytes, 0, responseInBytes.Length);
+            MockTcpClient.Setup(x => x.GetStream()).Returns(stream);
+            MockTcpClient.Setup(x => x.Close());
+
+            var actual = Subject.IsServerAvailable();
+
+            Assert.That(actual, Is.True);
+            MockTcpClient.Verify(x => x.Close(), Times.Once);
+        }
+
+        [Test]
+        public void ShouldSendMailMessage()
+        {
+            var expected = new MailMessage();
+            var smtpClient = new Mock<ISmtpClient>();
+            smtpClient.Setup(x => x.Send(expected));
+            Subject.SmtpClient = smtpClient.Object;
+
+            Subject.Send(expected);
+
+            smtpClient.Verify(x => x.Send(expected), Times.Once);
+        }
+
+        [Test]
+        public void ShouldLogExceptionIfMailMessageFailsToSend()
+        {
+            var expected = new MailMessage();
+            var smtpClient = new Mock<ISmtpClient>();
+            var expectedException = new Exception();
+            smtpClient.Setup(x => x.Send(expected))
+                .Throws(expectedException);
+            Subject.SmtpClient = smtpClient.Object;
+
+            Subject.Send(expected);
+
+            smtpClient.Verify(x => x.Send(expected), Times.Once);
+            MockLog.Verify(x => x.Error(expectedException), Times.Once);
+        }
+    }
+}
+
diff --git a/IntegrationEngine.Core.Tests/Storage/StubDeleteRequest.cs b/IntegrationEngine.Core.Tests/Storage/StubDeleteRequest.cs
@@ -3,7 +3,7 @@
 using Nest;
 using System;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubDeleteRequest : IDeleteRequest
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubElasticClient.cs b/IntegrationEngine.Core.Tests/Storage/StubElasticClient.cs
@@ -1,7 +1,7 @@
 ﻿using Nest;
 using System;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubElasticClient : IElasticClient
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubElasticsearchResponse.cs b/IntegrationEngine.Core.Tests/Storage/StubElasticsearchResponse.cs
@@ -2,7 +2,7 @@
 using Elasticsearch.Net.Connection;
 using System;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubElasticsearchResponse : IElasticsearchResponse
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubExistsResponse.cs b/IntegrationEngine.Core.Tests/Storage/StubExistsResponse.cs
@@ -1,7 +1,7 @@
 ﻿using Nest;
 using System;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubExistsResponse : IExistsResponse
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubGetResponse.cs b/IntegrationEngine.Core.Tests/Storage/StubGetResponse.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using Nest;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubGetResponse<TItem> : IGetResponse<TItem> where TItem : class
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubHit.cs b/IntegrationEngine.Core.Tests/Storage/StubHit.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubHit<TItem> : IHit<TItem> where TItem : class
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubIndexResponse.cs b/IntegrationEngine.Core.Tests/Storage/StubIndexResponse.cs
@@ -2,7 +2,7 @@
 using Nest;
 using System;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubIndexResponse : IIndexResponse
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubPingResponse.cs b/IntegrationEngine.Core.Tests/Storage/StubPingResponse.cs
@@ -2,7 +2,7 @@
 using Nest;
 using System;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubPingResponse : IPingResponse
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubSearchResponse.cs b/IntegrationEngine.Core.Tests/Storage/StubSearchResponse.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubSearchResponse<TDocument> : ISearchResponse<TDocument> where TDocument : class
     {
diff --git a/IntegrationEngine.Core.Tests/Storage/StubUpdateResponse.cs b/IntegrationEngine.Core.Tests/Storage/StubUpdateResponse.cs
@@ -1,7 +1,7 @@
 ﻿using Nest;
 using System;
 
-namespace IntegrationEngine.Core.Tests
+namespace IntegrationEngine.Core.Tests.Storage
 {
     public class StubUpdateResponse : IUpdateResponse
     {
diff --git a/IntegrationEngine.Core/IntegrationEngine.Core.csproj b/IntegrationEngine.Core/IntegrationEngine.Core.csproj
@@ -104,6 +104,10 @@
     <Compile Include="Storage\ElasticsearchRepository.cs" />
     <Compile Include="Storage\IDatabaseRepository.cs" />
     <Compile Include="Storage\DatabaseRepository.cs" />
+    <Compile Include="Mail\ITcpClient.cs" />
+    <Compile Include="Mail\TcpClientAdapter.cs" />
+    <Compile Include="Mail\SmtpClientAdapter.cs" />
+    <Compile Include="Mail\ISmtpClient.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/IntegrationEngine.Core/Mail/IMailClient.cs b/IntegrationEngine.Core/Mail/IMailClient.cs
@@ -6,7 +6,7 @@ namespace IntegrationEngine.Core.Mail
     public interface IMailClient
     {
         MailConfiguration MailConfiguration { get; set; }
-        SmtpClient SmtpClient { get; set; }
+        ISmtpClient SmtpClient { get; set; }
         void Send(MailMessage mailMessage);
         bool IsServerAvailable();
     }
diff --git a/IntegrationEngine.Core/Mail/ISmtpClient.cs b/IntegrationEngine.Core/Mail/ISmtpClient.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.Net.Mail;
+
+namespace IntegrationEngine.Core
+{
+    public interface ISmtpClient
+    {
+        string Host { get; set; }
+        int Port { get; set; }
+        void Send(MailMessage message);
+    }
+}
+
diff --git a/IntegrationEngine.Core/Mail/ITcpClient.cs b/IntegrationEngine.Core/Mail/ITcpClient.cs
@@ -0,0 +1,13 @@
+﻿using System;
+using System.IO;
+
+namespace IntegrationEngine.Core.Mail
+{
+    public interface ITcpClient
+    {
+        void Connect(string hostname, int port);
+        Stream GetStream();
+        void Close();
+    }
+}
+
diff --git a/IntegrationEngine.Core/Mail/MailClient.cs b/IntegrationEngine.Core/Mail/MailClient.cs
@@ -4,17 +4,21 @@
 using System.Net.Mail;
 using System.Net.Sockets;
 using System.IO;
+using System.Text;
 
 namespace IntegrationEngine.Core.Mail
 {
     public class MailClient : IMailClient
     {
-        public SmtpClient SmtpClient { get; set; }
+        public ISmtpClient SmtpClient { get; set; }
         public MailConfiguration MailConfiguration { get; set; }
         public ILog Log { get; set; }
+        public ITcpClient TcpClient { get; set; }
 
         public MailClient()
-        {}
+        {
+            SmtpClient = new SmtpClientAdapter();
+        }
 
         public MailClient (ILog log) : this()
         {
@@ -23,7 +27,8 @@ public MailClient (ILog log) : this()
 
         public void Send(MailMessage mailMessage)
         {
-            ConfigureSmtpClient();
+            SmtpClient.Host = MailConfiguration.HostName;
+            SmtpClient.Port = MailConfiguration.Port;
             try
             {
                 SmtpClient.Send(mailMessage);
@@ -34,42 +39,34 @@ public void Send(MailMessage mailMessage)
             }
         }
 
-        void ConfigureSmtpClient()
-        {
-            if (SmtpClient == null)
-                SmtpClient = new SmtpClient();
-            SmtpClient.Host = MailConfiguration.HostName;
-            SmtpClient.Port = MailConfiguration.Port;
-        }
-
         public bool IsServerAvailable()
         {
+            var isAvailable = false;
             try 
             {
-                using (var client = new TcpClient())
+                if (TcpClient == null)
+                    TcpClient = new TcpClientAdapter();
+                TcpClient.Connect(MailConfiguration.HostName, MailConfiguration.Port);
+                using (var stream = TcpClient.GetStream())
                 {
-                    client.Connect(MailConfiguration.HostName, MailConfiguration.Port);
-                    using (var stream = client.GetStream())
+                    using (var writer = new StreamWriter(stream))
+                    using (var reader = new StreamReader(stream))
                     {
-                        using (var writer = new StreamWriter(stream))
-                        using (var reader = new StreamReader(stream))
-                        {
-                            writer.WriteLine("EHLO " + MailConfiguration.HostName);
-                            writer.Flush();
-                            var response = reader.ReadLine();
-                            Log.Debug(x => x("Mail server status: {0}", response));
-                            if (response != null)
-                                return true;
-                        }
+                        writer.WriteLine("EHLO " + MailConfiguration.HostName);
+                        writer.Flush();
+                        stream.Position = 0;
+                        reader.DiscardBufferedData();
+                        isAvailable = reader.ReadLine() != null;
                     }
                 }
+                TcpClient.Close();
             }
             catch(SocketException exception) 
             {
                 Log.Error(exception);
-                return false;
+                isAvailable = false;
             }
-            return false;
+            return isAvailable;
         }
     }
 }
diff --git a/IntegrationEngine.Core/Mail/SmtpClientAdapter.cs b/IntegrationEngine.Core/Mail/SmtpClientAdapter.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Net.Mail;
+
+namespace IntegrationEngine.Core
+{
+    public class SmtpClientAdapter : ISmtpClient
+    {
+        public SmtpClient SmtpClient { get; set; }
+        public string Host { get { return SmtpClient.Host; } set { SmtpClient.Host = value; } }
+        public int Port { get { return SmtpClient.Port; } set { SmtpClient.Port = value; } }
+
+        public SmtpClientAdapter()
+        {
+        }
+            
+        public virtual void Send(MailMessage mailMessage)
+        {
+            SmtpClient.Send(mailMessage);
+        }
+    }
+}
+
diff --git a/IntegrationEngine.Core/Mail/TcpClientAdapter.cs b/IntegrationEngine.Core/Mail/TcpClientAdapter.cs
diff --git a/IntegrationEngine.userprefs b/IntegrationEngine.userprefs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Nest;`
`4`	`4`	`using System;`
`5`	`5`
`6`		`-namespace IntegrationEngine.Core.Tests`
	`6`	`+namespace IntegrationEngine.Core.Tests.Storage`
`7`	`7`	`{`
`8`	`8`	`public class StubDeleteRequest : IDeleteRequest`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Nest;`
`2`	`2`	`using System;`
`3`	`3`
`4`		`-namespace IntegrationEngine.Core.Tests`
	`4`	`+namespace IntegrationEngine.Core.Tests.Storage`
`5`	`5`	`{`
`6`	`6`	`public class StubElasticClient : IElasticClient`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Elasticsearch.Net.Connection;`
`3`	`3`	`using System;`
`4`	`4`
`5`		`-namespace IntegrationEngine.Core.Tests`
	`5`	`+namespace IntegrationEngine.Core.Tests.Storage`
`6`	`6`	`{`
`7`	`7`	`public class StubElasticsearchResponse : IElasticsearchResponse`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`5`	`5`
`6`		`-namespace IntegrationEngine.Core.Tests`
	`6`	`+namespace IntegrationEngine.Core.Tests.Storage`
`7`	`7`	`{`
`8`	`8`	`public class StubHit<TItem> : IHit<TItem> where TItem : class`
`9`	`9`	`{`