Revert mail client is available feature

Author: ethanhann

IntegrationEngine.Core.Tests/Mail/MailClientTest.cs

@@ -14,7 +14,6 @@ namespace IntegrationEngine.Core.Tests.Mail
 {
     public class MailClientTest : TestBase<MailClient>
     {
-        public Mock<ITcpClient> MockTcpClient { get; set; }
         public Mock<ILog> MockLog { get; set; }
 
         [SetUp]
@@ -26,17 +25,11 @@ public void Setup()
                 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();
@@ -45,25 +38,26 @@ public void ShouldLogExceptionAndReturnFalseIfMailServerIsNotAvailable()
             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());
+        // @TODO Do not mock tcp client, instead test with listener or real mail server.
+        //[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();
+        //    var actual = Subject.IsServerAvailable();
 
-            Assert.That(actual, Is.True);
-            MockTcpClient.Verify(x => x.Close(), Times.Once);
-        }
+        //    Assert.That(actual, Is.True);
+        //    MockTcpClient.Verify(x => x.Close(), Times.Once);
+        //}
 
         [Test]
         public void ShouldSendMailMessage()

IntegrationEngine.Core/Mail/MailClient.cs

@@ -13,7 +13,6 @@ public class MailClient : IMailClient
         public ISmtpClient SmtpClient { get; set; }
         public MailConfiguration MailConfiguration { get; set; }
         public ILog Log { get; set; }
-        public ITcpClient TcpClient { get; set; }
 
         public MailClient()
         {
@@ -42,26 +41,26 @@ public void Send(MailMessage mailMessage)
         public bool IsServerAvailable()
         {
             var isAvailable = false;
-            try 
+            try
             {
-                if (TcpClient == null)
-                    TcpClient = new TcpClientAdapter();
-                TcpClient.Connect(MailConfiguration.HostName, MailConfiguration.Port);
-                using (var stream = TcpClient.GetStream())
+                using (var client = new TcpClient())
                 {
-                    using (var writer = new StreamWriter(stream))
-                    using (var reader = new StreamReader(stream))
+                    client.Connect(MailConfiguration.HostName, MailConfiguration.Port);
+                    using (var stream = client.GetStream())
                     {
-                        writer.WriteLine("EHLO " + MailConfiguration.HostName);
-                        writer.Flush();
-                        stream.Position = 0;
-                        reader.DiscardBufferedData();
-                        isAvailable = reader.ReadLine() != null;
+                        using (var writer = new StreamWriter(stream))
+                        using (var reader = new StreamReader(stream))
+                        {
+                            writer.WriteLine("EHLO " + MailConfiguration.HostName);
+                            writer.Flush();
+                            var response = reader.ReadLine();
+                            if (response != null)
+                                isAvailable = true;
+                        }
                     }
                 }
-                TcpClient.Close();
             }
-            catch(SocketException exception) 
+            catch (SocketException exception)
             {
                 Log.Error(exception);
                 isAvailable = false;