fixup! Replace IObjectsFactory with IServiceProvider interface

Avoid corrupting following tests in case of failure

Author: fredericDelaporte

src/NHibernate.Test/Async/CfgTest/SettingsFactoryFixture.cs

@@ -50,8 +50,6 @@ private Task InvalidRegisteredServiceAsync<TService>()
 		{
 			try
 			{
-				var originalSp = Environment.ServiceProvider;
-
 				var sp = new DefaultServiceProvider();
 				sp.Register<TService>(() => throw new InvalidOperationException());
 
@@ -69,14 +67,26 @@ private Task InvalidRegisteredServiceAsync<TService>()
 				Assert.Throws<HibernateException>(
 				() => new SettingsFactory().BuildSettings(properties),
 				$"HibernateException should be thrown for service {typeof(TService)}");
-
-				Environment.ServiceProvider = originalSp;
 				return Task.CompletedTask;
 			}
 			catch (Exception ex)
 			{
 				return Task.FromException<object>(ex);
 			}
 		}
+
+		private IServiceProvider _originalSp;
+
+		[SetUp]
+		public void Setup()
+		{
+			_originalSp = Environment.ServiceProvider;
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Environment.ServiceProvider = _originalSp;
+		}
 	}
 }

src/NHibernate.Test/CfgTest/SettingsFactoryFixture.cs

@@ -57,8 +57,6 @@ public void DefaultServices()
 		[Test]
 		public void RegisteredServices()
 		{
-			var originalSp = Environment.ServiceProvider;
-
 			var batcherFactory = Substitute.For<IBatcherFactory>();
 			var cacheProvider = Substitute.For<ICacheProvider>();
 			var connectionProvider = Substitute.For<IConnectionProvider>();
@@ -99,8 +97,6 @@ public void RegisteredServices()
 			Assert.That(settings.QueryTranslatorFactory, Is.EqualTo(queryTranslatorFactory));
 			Assert.That(settings.SqlExceptionConverter, Is.EqualTo(sqlExceptionConverter));
 			Assert.That(settings.TransactionFactory, Is.EqualTo(transactionFactory));
-
-			Environment.ServiceProvider = originalSp;
 		}
 
 		[Test]
@@ -119,8 +115,6 @@ public void InvalidRegisteredServices()
 
 		private void InvalidRegisteredService<TService>()
 		{
-			var originalSp = Environment.ServiceProvider;
-
 			var sp = new DefaultServiceProvider();
 			sp.Register<TService>(() => throw new InvalidOperationException());
 
@@ -138,8 +132,20 @@ private void InvalidRegisteredService<TService>()
 			Assert.Throws<HibernateException>(
 				() => new SettingsFactory().BuildSettings(properties),
 				$"HibernateException should be thrown for service {typeof(TService)}");
+		}
+
+		private IServiceProvider _originalSp;
 
-			Environment.ServiceProvider = originalSp;
+		[SetUp]
+		public void Setup()
+		{
+			_originalSp = Environment.ServiceProvider;
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Environment.ServiceProvider = _originalSp;
 		}
 	}
 }

src/NHibernate.Test/UtilityTest/PropertiesHelperTest.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using NHibernate.Bytecode;
 using NHibernate.Connection;
@@ -59,7 +60,6 @@ public void GetInstanceByDefault()
 		[Test]
 		public void GetInstanceByRegistration()
 		{
-			var originalSp = Cfg.Environment.ServiceProvider;
 			var sp = new DefaultServiceProvider();
 			sp.Register<IConnectionProvider, DriverConnectionProvider>();
 			Cfg.Environment.ServiceProvider = sp;
@@ -69,8 +69,6 @@ public void GetInstanceByRegistration()
 				typeof(DebugConnectionProvider));
 			Assert.That(instance, Is.Not.Null);
 			Assert.That(instance, Is.TypeOf<DriverConnectionProvider>());
-
-			Cfg.Environment.ServiceProvider = originalSp;
 		}
 
 		[Test]
@@ -100,7 +98,6 @@ public void GetInstanceByInvalidDefault()
 		[Test]
 		public void GetInstanceByInvalidRegistration()
 		{
-			var originalSp = Cfg.Environment.ServiceProvider;
 			var sp = new DefaultServiceProvider();
 			sp.Register(typeof(IConnectionProvider), () => new PropertiesHelperTest());
 			Cfg.Environment.ServiceProvider = sp;
@@ -112,7 +109,6 @@ public void GetInstanceByInvalidRegistration()
 						new Dictionary<string, string>(),
 						typeof(DriverConnectionProvider));
 				});
-			Cfg.Environment.ServiceProvider = originalSp;
 		}
 
 		[Test]
@@ -127,5 +123,19 @@ public void GetInstanceByInvalidProperty()
 						typeof(DriverConnectionProvider));
 				});
 		}
+
+		private IServiceProvider _originalSp;
+
+		[SetUp]
+		public void Setup()
+		{
+			_originalSp = Cfg.Environment.ServiceProvider;
+		}
+
+		[TearDown]
+		public void TearDown()
+		{
+			Cfg.Environment.ServiceProvider = _originalSp;
+		}
 	}
 }