From ae404bea0f036be8fc4fec0fcf1ad6862c1b32b9 Mon Sep 17 00:00:00 2001
From: Yvan Duhamel <yvandev@outlook.fr>
Date: Fri, 18 Jan 2019 15:05:16 +0100
Subject: [PATCH] Update logging

---
 LDAPCP.Tests/UnitTestsHelper.cs | 15 ++++++++++-----
 LDAPCP.Tests/local.runsettings  |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/LDAPCP.Tests/UnitTestsHelper.cs b/LDAPCP.Tests/UnitTestsHelper.cs
index 9433eb2..cb59b7a 100644
--- a/LDAPCP.Tests/UnitTestsHelper.cs
+++ b/LDAPCP.Tests/UnitTestsHelper.cs
@@ -10,6 +10,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
 using System.Security.Claims;
 
 [SetUpFixture]
@@ -41,17 +42,19 @@ public class UnitTestsHelper
 
     public static SPTrustedLoginProvider SPTrust => SPSecurityTokenServiceManager.Local.TrustedLoginProviders.FirstOrDefault(x => String.Equals(x.ClaimProviderName, UnitTestsHelper.ClaimsProviderName, StringComparison.InvariantCultureIgnoreCase));
 
+    static TextWriterTraceListener logFileListener;
+
     [OneTimeSetUp]
     public static void InitializeSiteCollection()
     {
 #if DEBUG
-        //return; // Uncommented when debugging AzureCP code from unit tests
+        //return; // Uncommented when debugging LDAPCP code from unit tests
 #endif
 
-        Trace.Listeners.Add(new TextWriterTraceListener(Console.Out));
-        Trace.Listeners.Add(new TextWriterTraceListener("LDAPCPIntegrationTests.log"));
+        logFileListener = new TextWriterTraceListener(TestContext.Parameters["TestLogFileName"]);
+        Trace.Listeners.Add(logFileListener);
         Trace.AutoFlush = true;
-        Trace.TraceInformation($"{DateTime.Now.ToString("s")} Starting integration tests of claims provider {ClaimsProviderName}...");
+        Trace.TraceInformation($"{DateTime.Now.ToString("s")} Start integration tests {ClaimsProviderName} {FileVersionInfo.GetVersionInfo(Assembly.GetAssembly(typeof(ldapcp.LDAPCP)).Location).FileVersion}.");
         Trace.WriteLine($"{DateTime.Now.ToString("s")} DataFile_AllAccounts_Search: {DataFile_AllAccounts_Search}");
         Trace.WriteLine($"{DateTime.Now.ToString("s")} DataFile_AllAccounts_Validate: {DataFile_AllAccounts_Validate}");
         Trace.WriteLine($"{DateTime.Now.ToString("s")} TestSiteCollectionUri: {TestContext.Parameters["TestSiteCollectionUri"]}");
@@ -104,8 +107,10 @@ public static void InitializeSiteCollection()
     [OneTimeTearDown]
     public void Cleanup()
     {
-        Trace.WriteLine($"{DateTime.Now.ToString("s")} Integration tests of claims provider {ClaimsProviderName} finished.");
+        Trace.WriteLine($"{DateTime.Now.ToString("s")} Integration tests of {ClaimsProviderName} {FileVersionInfo.GetVersionInfo(Assembly.GetAssembly(typeof(ldapcp.LDAPCP)).Location).FileVersion} finished.");
         Trace.Flush();
+        if (logFileListener != null)
+            logFileListener.Dispose();
     }
 
     public static void InitializeConfiguration(LDAPCPConfig config)
diff --git a/LDAPCP.Tests/local.runsettings b/LDAPCP.Tests/local.runsettings
index f9719f5..3bb812a 100644
--- a/LDAPCP.Tests/local.runsettings
+++ b/LDAPCP.Tests/local.runsettings
@@ -10,5 +10,6 @@
     <Parameter name="TestSiteCollectionUri" value="http://spsites/sites/LDAPCP.UnitTests" />
     <Parameter name="TrustedGroupToAdd_ClaimValue" value="contoso.local\group1" />
     <Parameter name="ClaimsProviderConfigName" value="LDAPCPConfig" />
+    <Parameter name="TestLogFileName" value="LDAPCPIntegrationTests.log" />
   </TestRunParameters>
 </RunSettings>