Fix empty configuation when tests run by Rider (#151)

* Fixed running tests in Rider
* Added missing Microsoft.NET.Test.Sdk to common tests

Author: hazzik

CoreDistributedCache/NHibernate.Caches.CoreDistributedCache.Tests/TestsContext.cs

@@ -13,7 +13,7 @@ public class TestsContext
 		public void RunBeforeAnyTests()
 		{
 #if !NETFX
-			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, "coredistributedcache");
+			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, ConfigurationProvider.SetConfiguration);
 #endif
 			ConfigureLog4Net();
 		}

CoreMemoryCache/NHibernate.Caches.CoreMemoryCache.Tests/TestsContext.cs

@@ -13,7 +13,7 @@ public class TestsContext
 		public void RunBeforeAnyTests()
 		{
 #if !NETFX
-			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, "corememorycache");
+			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, ConfigurationProvider.SetConfiguration);
 #endif
 			ConfigureLog4Net();
 		}

NHibernate.Caches.Common.Tests/NHibernate.Caches.Common.Tests.csproj

@@ -23,6 +23,11 @@
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
     <PackageReference Include="NUnitLite" Version="3.14.0" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.17" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NHibernate.Caches.Common\NHibernate.Caches.Common.csproj" />
   </ItemGroup>

NHibernate.Caches.Common.Tests/TestsContextHelper.cs

@@ -1,64 +1,35 @@
 #if !NETFX
+using System;
 using System.Configuration;
 using System.IO;
 using System.Reflection;
-using NHibernate.Cfg;
 using NHibernate.Cfg.ConfigurationSchema;
 using NUnit.Framework;
-using Environment = NHibernate.Cfg.Environment;
 
 namespace NHibernate.Caches.Common.Tests
 {
 	public static class TestsContextHelper
 	{
-		public static bool ExecutingWithVsTest { get; } =
-			Assembly.GetEntryAssembly()?.GetName().Name == "testhost";
-
-		private static bool _removeTesthostConfig;
-
-		public static void RunBeforeAnyTests(Assembly testAssembly, string configSectionName)
+		public static void RunBeforeAnyTests(Assembly testAssembly, Action<Configuration> configure)
 		{
 			//When .NET Core App 2.0 tests run from VS/VSTest the entry assembly is "testhost.dll"
 			//so we need to explicitly load the configuration
-			if (ExecutingWithVsTest)
+			if (Assembly.GetEntryAssembly() != null)
 			{
 				var assemblyPath =
 					Path.Combine(TestContext.CurrentContext.TestDirectory, Path.GetFileName(testAssembly.Location));
-				Environment.InitializeGlobalProperties(GetTestAssemblyHibernateConfiguration(assemblyPath));
-				ReadCoreCacheSectionFromTesthostConfig(assemblyPath, configSectionName);
+				var configuration = ConfigurationManager.OpenExeConfiguration(assemblyPath);
+				Cfg.Environment.InitializeGlobalProperties(GetTestAssemblyHibernateConfiguration(configuration));
+				configure?.Invoke(configuration);
 			}
 		}
 
 		public static void RunAfterAnyTests()
 		{
-			if (_removeTesthostConfig)
-			{
-				File.Delete(GetTesthostConfigPath());
-			}
-		}
-
-		private static void ReadCoreCacheSectionFromTesthostConfig(string assemblyPath, string configSectionName)
-		{
-			// For caches section, ConfigurationManager being used, the only general workaround is to provide
-			// the configuration with its expected file name... (Another option would be to explicitly setup each cache
-			// ConfigurationProvider.)
-			var configPath = assemblyPath + ".config";
-			// If this copy fails: either testconfig has started having its own file, and this hack can no more be used,
-			// or a previous test run was interrupted before its cleanup (RunAfterAnyTests): go clean it manually.
-			// Discussion about this mess: https://github.com/dotnet/corefx/issues/22101
-			File.Copy(configPath, GetTesthostConfigPath());
-			_removeTesthostConfig = true;
-			ConfigurationManager.RefreshSection(configSectionName);
-		}
-
-		private static string GetTesthostConfigPath()
-		{
-			return Assembly.GetEntryAssembly().Location + ".config";
 		}
 
-		private static IHibernateConfiguration GetTestAssemblyHibernateConfiguration(string assemblyPath)
+		private static Cfg.IHibernateConfiguration GetTestAssemblyHibernateConfiguration(Configuration configuration)
 		{
-			var configuration = ConfigurationManager.OpenExeConfiguration(assemblyPath);
 			var section = configuration.GetSection(CfgXmlHelper.CfgSectionName);
 			return HibernateConfiguration.FromAppConfig(section.SectionInformation.GetRawXml());
 		}

RtMemoryCache/NHibernate.Caches.RtMemoryCache.Tests/TestsContext.cs

@@ -13,7 +13,7 @@ public class TestsContext
 		public void RunBeforeAnyTests()
 		{
 #if !NETFX
-			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, "coredistributedcache");
+			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, ConfigurationProvider.SetConfiguration);
 #endif
 			ConfigureLog4Net();
 		}

StackExchangeRedis/NHibernate.Caches.StackExchangeRedis.Tests/TestsContext.cs

@@ -13,7 +13,7 @@ public class TestsContext
 		public void RunBeforeAnyTests()
 		{
 #if !NETFX
-			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, "redis");
+			TestsContextHelper.RunBeforeAnyTests(typeof(TestsContext).Assembly, ConfigurationProvider.SetConfiguration);
 #endif
 			ConfigureLog4Net();
 		}