Move tests to SmtpServer 11 (#230)

Author: 304NotModified

test/NLog.MailKit.Tests/IntegrationTests/MailTargetIntegrationTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using NLog.Config;
@@ -80,10 +81,9 @@ public void SendMailWithHeaderFooter()
                 mailTarget.Footer = " *** End *** ";
             }, 1);
 
-            var mailMessage = transactions.LastOrDefault()?.Message as SmtpServer.Mail.ITextMessage;
-            Assert.NotNull(mailMessage);
-            mailMessage.Content.Position = 0;
-            var mailBody = new StreamReader(mailMessage.Content).ReadToEnd();
+            var receivedMessage = transactions.LastOrDefault();
+            Assert.NotNull(receivedMessage);
+            var mailBody = receivedMessage.GetBodyAsString();
             Assert.NotNull(mailBody);
             Assert.Contains("*** Begin ***", mailBody);
             Assert.Contains("*** End ***", mailBody);
@@ -131,16 +131,15 @@ public void SendMailBatch()
                 logger.Info("hello starting mail!");
             }, 1);
 
-            var mailMessage = transactions.LastOrDefault()?.Message as SmtpServer.Mail.ITextMessage;
-            Assert.NotNull(mailMessage);
-            mailMessage.Content.Position = 0;
-            var mailBody = new StreamReader(mailMessage.Content).ReadToEnd();
+            var receivedMessage = transactions.LastOrDefault();
+            Assert.NotNull(receivedMessage);
+            var mailBody = receivedMessage.GetBodyAsString();
             Assert.NotNull(mailBody);
             Assert.Contains("hello starting mail!", mailBody);
             Assert.Contains("hello first mail!", mailBody);
         }
 
-        private static IList<IMessageTransaction> SendTest(Action createConfig, int toCount)
+        private static IList<ReceivedMessage> SendTest(Action createConfig, int toCount)
         {
             var countdownEvent = new CountdownEvent(1);
 
@@ -151,6 +150,8 @@ private static IList<IMessageTransaction> SendTest(Action createConfig, int toCo
 
             Task.Run(async () => await smtpServer.StartAsync(cancellationToken.Token), cancellationToken.Token);
 
+            WaitForSmtpServer();
+
             createConfig();
 
             var logger = LogManager.GetLogger("logger1");
@@ -178,14 +179,26 @@ private static void AssertMailBox(string expected, IMailbox mailbox)
             Assert.Equal(expected, mailbox.User + "@" + mailbox.Host);
         }
 
-        private static string GetReceivedBody(IMessageTransaction receivedMessage)
+        private static string GetReceivedBody(ReceivedMessage receivedMessage)
         {
-            if (receivedMessage.Message is ITextMessage textMessage)
+            return receivedMessage.GetBodyAsString();
+        }
+
+        private static void WaitForSmtpServer(int port = 587, int maxAttempts = 50)
+        {
+            for (var i = 0; i < maxAttempts; i++)
             {
-                var streamReader = new StreamReader(textMessage.Content);
-                return streamReader.ReadToEnd();
+                try
+                {
+                    using var client = new TcpClient();
+                    client.Connect("127.0.0.1", port);
+                    return;
+                }
+                catch (SocketException)
+                {
+                    Thread.Sleep(100);
+                }
             }
-            throw new NotSupportedException("only ITextMessage supported");
         }
 
         private static SmtpServer.SmtpServer CreateSmtpServer(MessageStore store)
@@ -197,12 +210,13 @@ private static SmtpServer.SmtpServer CreateSmtpServer(MessageStore store)
             var options = new SmtpServerOptionsBuilder()
                 .ServerName("localhost")
                 .Port(25, 587)
-                .MessageStore(store)
-                .UserAuthenticator(userAuthenticatorFactory)
                 .Build();
 
-            var smtpServer = new SmtpServer.SmtpServer(options);
-            return smtpServer;
+            var serviceProvider = new SmtpServer.ComponentModel.ServiceProvider();
+            serviceProvider.Add((SmtpServer.Storage.IMessageStoreFactory)store);
+            serviceProvider.Add(userAuthenticatorFactory);
+
+            return new SmtpServer.SmtpServer(options, serviceProvider);
         }
 
         private static MailTarget CreateNLogConfig()

test/NLog.MailKit.Tests/IntegrationTests/Util/MessageStore.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,7 +11,7 @@ namespace NLog.MailKit.Tests.IntegrationTests.Util
 {
     public class MessageStore : IMessageStore, IMessageStoreFactory
     {
-        public IList<IMessageTransaction> ReceivedTransactions { get; } = new List<IMessageTransaction>();
+        public IList<ReceivedMessage> ReceivedTransactions { get; } = new List<ReceivedMessage>();
 
         private readonly CountdownEvent _countdownEvent;
 
@@ -27,9 +28,9 @@ public IMessageStore CreateInstance(ISessionContext context)
         #region Implementation of IMessageStore
 
         /// <inheritdoc />
-        public Task<SmtpResponse> SaveAsync(ISessionContext context, IMessageTransaction transaction, CancellationToken cancellationToken)
+        public Task<SmtpResponse> SaveAsync(ISessionContext context, IMessageTransaction transaction, ReadOnlySequence<byte> buffer, CancellationToken cancellationToken)
         {
-            ReceivedTransactions.Add(transaction);
+            ReceivedTransactions.Add(new ReceivedMessage(transaction, buffer.ToArray()));
             _countdownEvent.Signal();
             return Task.FromResult(SmtpResponse.Ok);
         }

test/NLog.MailKit.Tests/IntegrationTests/Util/ReceivedMessage.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using System.Text;
+using SmtpServer;
+using SmtpServer.Mail;
+
+namespace NLog.MailKit.Tests.IntegrationTests.Util
+{
+    public class ReceivedMessage
+    {
+        private readonly IMessageTransaction _transaction;
+
+        public ReceivedMessage(IMessageTransaction transaction, byte[] body)
+        {
+            _transaction = transaction;
+            Body = body;
+        }
+
+        public IMailbox From => _transaction.From;
+        public IList<IMailbox> To => _transaction.To;
+        public byte[] Body { get; }
+
+        public string GetBodyAsString() => Encoding.UTF8.GetString(Body);
+    }
+}

test/NLog.MailKit.Tests/NLog.MailKit.Tests.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-    <PackageReference Include="SmtpServer" Version="7.2.0" />
+    <PackageReference Include="SmtpServer" Version="11.1.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>