From af6df05e9da9d6327613fffdecb754e6c345742f Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 3 Sep 2018 13:56:35 +0200
Subject: [PATCH] refactoring

---
 test/Mandatory/EMailling.cs         | 12 ++--
 test/Mandatory/ServerSideFixture.cs | 86 ++++++++++++++++++++++++-----
 test/Startup.cs                     |  2 +-
 3 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/test/Mandatory/EMailling.cs b/test/Mandatory/EMailling.cs
index 9f0e14fd..d5410f9e 100644
--- a/test/Mandatory/EMailling.cs
+++ b/test/Mandatory/EMailling.cs
@@ -13,10 +13,12 @@ namespace test
     {
         ServerSideFixture _serverFixture;
         ITestOutputHelper output;
+        ILogger _logger;
         public EMaillingTests(ServerSideFixture serverFixture, ITestOutputHelper output)
         {
             this.output = output;
             _serverFixture = serverFixture;
+            _logger = serverFixture.Logger;
         }
 
         [Fact]
@@ -26,14 +28,14 @@ namespace test
           AssertAsync.CompletesIn(2, () =>
               {
               output.WriteLine("SendEMailSynchrone ...");
-              EmailSentViewModel mailSentInfo = _serverFixture._mailSender.SendEmailAsync
-              (_serverFixture._siteSetup.Owner.Name, _serverFixture._siteSetup.Owner.EMail, $"monthly email", "test boby monthly email").Result;
+              EmailSentViewModel mailSentInfo = _serverFixture.MailSender.SendEmailAsync
+              (_serverFixture.SiteSetup.Owner.Name, _serverFixture.SiteSetup.Owner.EMail, $"monthly email", "test boby monthly email").Result;
               if (mailSentInfo==null) 
-              _serverFixture._logger.LogError("No info on sending");
+              _logger.LogError("No info on sending");
               else if (!mailSentInfo.Sent)
-              _serverFixture._logger.LogError($"{mailSentInfo.ErrorMessage}");
+              _logger.LogError($"{mailSentInfo.ErrorMessage}");
               else 
-              _serverFixture._logger.LogInformation($"mailId:{mailSentInfo.MessageId} \nto:{_serverFixture._siteSetup.Owner.Name}");
+              _logger.LogInformation($"mailId:{mailSentInfo.MessageId} \nto:{_serverFixture.SiteSetup.Owner.Name}");
               Assert.NotNull(mailSentInfo);
               output.WriteLine($">>done with {mailSentInfo.EMail} {mailSentInfo.Sent} {mailSentInfo.MessageId} {mailSentInfo.ErrorMessage}");
               });
diff --git a/test/Mandatory/ServerSideFixture.cs b/test/Mandatory/ServerSideFixture.cs
index 42085946..1cc4e3bb 100644
--- a/test/Mandatory/ServerSideFixture.cs
+++ b/test/Mandatory/ServerSideFixture.cs
@@ -12,19 +12,75 @@ namespace test
 {
     [Trait("regres", "no")]
     public class ServerSideFixture : IDisposable { 
-        public SiteSettings _siteSetup;
-        public ILogger _logger;
-        public IApplication _app;
-        public EMailer _mailer;
-        public ILoggerFactory _loggerFactory;
-        public IEmailSender _mailSender;
+        SiteSettings _siteSetup;
+        ILogger _logger;
+        IApplication _app;
+        EMailer _mailer;
+        ILoggerFactory _loggerFactory;
+        IEmailSender _mailSender;
         public static string ApiKey  => "53f4d5da-93a9-4584-82f9-b8fdf243b002" ;
+
+        public SiteSettings SiteSetup
+        {
+            get
+            {
+                return _siteSetup;
+            }
+
+            set
+            {
+                _siteSetup = value;
+            }
+        }
+
+        public IEmailSender MailSender
+        {
+            get
+            {
+                return _mailSender;
+            }
+
+            set
+            {
+                _mailSender = value;
+            }
+        }
+
+        public IApplication App
+        {
+            get
+            {
+                return _app;
+            }
+
+            set
+            {
+                _app = value;
+            }
+        }
+
+        public ILogger Logger
+        {
+            get
+            {
+                return _logger;
+            }
+
+            set
+            {
+                _logger = value;
+            }
+        }
+
+
+
+
         // 
         public ServerSideFixture()
         {
             InitTestHost();
-            _logger = _loggerFactory.CreateLogger<ServerSideFixture> ();
-            _logger.LogInformation("ServerSideFixture");
+            Logger = _loggerFactory.CreateLogger<ServerSideFixture> ();
+            Logger.LogInformation("ServerSideFixture created.");
         }
 
         [Fact]
@@ -38,17 +94,17 @@ namespace test
             .UseStartup<test.Startup>()
             .Build();
 
-            _app = hostengnine.Start();
-            _mailer = _app.Services.GetService(typeof(EMailer)) as EMailer;
-            _loggerFactory = _app.Services.GetService(typeof(ILoggerFactory)) as ILoggerFactory;
-            var siteSetup = _app.Services.GetService(typeof(IOptions<SiteSettings>)) as IOptions<SiteSettings>;
-            _siteSetup = siteSetup.Value;
-            _mailSender = _app.Services.GetService(typeof(IEmailSender)) as IEmailSender;
+            App = hostengnine.Start();
+            _mailer = App.Services.GetService(typeof(EMailer)) as EMailer;
+            _loggerFactory = App.Services.GetService(typeof(ILoggerFactory)) as ILoggerFactory;
+            var siteSetup = App.Services.GetService(typeof(IOptions<SiteSettings>)) as IOptions<SiteSettings>;
+            SiteSetup = siteSetup.Value;
+            MailSender = App.Services.GetService(typeof(IEmailSender)) as IEmailSender;
         }
 
         public void Dispose()
         {
-            _logger.LogInformation("Disposing");
+            Logger.LogInformation("Disposing");
         }
     }
 }
diff --git a/test/Startup.cs b/test/Startup.cs
index d9acab2d..ebecbd3e 100644
--- a/test/Startup.cs
+++ b/test/Startup.cs
@@ -18,7 +18,7 @@ namespace test
 {
     public class Startup
     {
-        public string ConnectionString
+        public static string ConnectionString
         {
             get ; set;
         }