Adjust tests to ensure generated async tests pass

Author: hazzik

src/NHibernate.Test/Async/SecondLevelCacheTest/InvalidationTests.cs

@@ -31,35 +31,30 @@ public class InvalidationTestsAsync : TestCase
 
 		protected override void Configure(Configuration configuration)
 		{
-			base.Configure(configuration);
-			configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
-			configuration.Properties[Environment.UseQueryCache] = "true";
+			configuration.SetProperty(Environment.CacheProvider, typeof(HashtableCacheProvider).AssemblyQualifiedName);
+			configuration.SetProperty(Environment.UseQueryCache, "true");
 		}
 
 		[Test]
 		public async Task InvalidatesEntitiesAsync()
 		{
+			var debugSessionFactory = (DebugSessionFactory) Sfi;
+			var sessionFactoryImpl = (SessionFactoryImpl) debugSessionFactory.ActualFactory;
+
 			var cache = Substitute.For<UpdateTimestampsCache>(Sfi.Settings, new Dictionary<string, string>());
-			((SessionFactoryImpl) (Sfi as DebugSessionFactory).ActualFactory).SetPropertyUsingReflection(
-				x => x.UpdateTimestampsCache,
-				cache);
+			sessionFactoryImpl.SetPropertyUsingReflection(x => x.UpdateTimestampsCache, cache);
 
 			//"Received" assertions can not be used since the collection is reused and cleared between calls.
 			//The received args are cloned and stored
 			var preInvalidations = new List<IReadOnlyCollection<string>>();
 			var invalidations = new List<IReadOnlyCollection<string>>();
 
-			await cache.PreInvalidateAsync(
-				Arg.Do<IReadOnlyCollection<string>>(x => preInvalidations.Add(x.ToList())),
-				CancellationToken.None);
-
-			await cache.InvalidateAsync(
-				Arg.Do<IReadOnlyCollection<string>>(x => invalidations.Add(x.ToList())),
-				CancellationToken.None);
+			await (cache.PreInvalidateAsync(Arg.Do<IReadOnlyCollection<string>>(x => preInvalidations.Add(x.ToList())), CancellationToken.None));
+			await (cache.InvalidateAsync(Arg.Do<IReadOnlyCollection<string>>(x => invalidations.Add(x.ToList())), CancellationToken.None));
 
-			using (ISession session = OpenSession())
+			using (var session = OpenSession())
 			{
-				using (ITransaction tx = session.BeginTransaction())
+				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
 					{
@@ -70,7 +65,7 @@ await cache.InvalidateAsync(
 					await (tx.CommitAsync());
 				}
 
-				using (ITransaction tx = session.BeginTransaction())
+				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
 					{
@@ -81,7 +76,7 @@ await cache.InvalidateAsync(
 					await (tx.CommitAsync());
 				}
 
-				using (ITransaction tx = session.BeginTransaction())
+				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
 					{
@@ -94,38 +89,21 @@ await cache.InvalidateAsync(
 			}
 
 			//Should receive one preinvalidation and one invalidation per commit
-			Assert.That(preInvalidations.Count,Is.EqualTo(3));
-			Assert.That(preInvalidations.All(x => x.Count == 1 && x.First() == "Item"), Is.True);
+			Assert.That(preInvalidations, Has.Count.EqualTo(3));
+			Assert.That(preInvalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 
-			Assert.That(invalidations.Count, Is.EqualTo(3));
-			Assert.That(invalidations.All(x => x.Count == 1 && x.First() == "Item"), Is.True);
-
-		}
-		
-		public async Task CleanUpAsync(CancellationToken cancellationToken = default(CancellationToken))
-		{
-			using (ISession s = OpenSession())
-			using (ITransaction tx = s.BeginTransaction())
-			{
-				await (s.DeleteAsync("from Item", cancellationToken));
-				await (tx.CommitAsync(cancellationToken));
-			}
+			Assert.That(invalidations, Has.Count.EqualTo(3));
+			Assert.That(invalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 		}
-		
-		public void CleanUp()
+
+		protected override void OnTearDown()
 		{
-			using (ISession s = OpenSession())
-			using (ITransaction tx = s.BeginTransaction())
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
 			{
 				s.Delete("from Item");
 				tx.Commit();
 			}
 		}
-
-		protected override void OnTearDown()
-		{
-			CleanUp();
-			base.OnTearDown();
-		}
 	}
 }

src/NHibernate.Test/SecondLevelCacheTest/InvalidationTests.cs

@@ -19,34 +19,30 @@ public class InvalidationTests : TestCase
 
 		protected override void Configure(Configuration configuration)
 		{
-			base.Configure(configuration);
-			configuration.Properties[Environment.CacheProvider] = typeof(HashtableCacheProvider).AssemblyQualifiedName;
-			configuration.Properties[Environment.UseQueryCache] = "true";
+			configuration.SetProperty(Environment.CacheProvider, typeof(HashtableCacheProvider).AssemblyQualifiedName);
+			configuration.SetProperty(Environment.UseQueryCache, "true");
 		}
 
 		[Test]
 		public void InvalidatesEntities()
 		{
+			var debugSessionFactory = (DebugSessionFactory) Sfi;
+			var sessionFactoryImpl = (SessionFactoryImpl) debugSessionFactory.ActualFactory;
+
 			var cache = Substitute.For<UpdateTimestampsCache>(Sfi.Settings, new Dictionary<string, string>());
-			((SessionFactoryImpl) (Sfi as DebugSessionFactory).ActualFactory).SetPropertyUsingReflection(
-				x => x.UpdateTimestampsCache,
-				cache);
+			sessionFactoryImpl.SetPropertyUsingReflection(x => x.UpdateTimestampsCache, cache);
 
 			//"Received" assertions can not be used since the collection is reused and cleared between calls.
 			//The received args are cloned and stored
 			var preInvalidations = new List<IReadOnlyCollection<string>>();
 			var invalidations = new List<IReadOnlyCollection<string>>();
 
-			cache
-				.When(x=>x.PreInvalidate(Arg.Any<IReadOnlyCollection<string>>()))
-				.Do(x=>preInvalidations.Add(((IReadOnlyCollection<string>) x[0]).ToList()));
-			cache
-				.When(x => x.Invalidate(Arg.Any<IReadOnlyCollection<string>>()))
-				.Do(x => invalidations.Add(((IReadOnlyCollection<string>) x[0]).ToList()));
+			cache.PreInvalidate(Arg.Do<IReadOnlyCollection<string>>(x => preInvalidations.Add(x.ToList())));
+			cache.Invalidate(Arg.Do<IReadOnlyCollection<string>>(x => invalidations.Add(x.ToList())));
 
-			using (ISession session = OpenSession())
+			using (var session = OpenSession())
 			{
-				using (ITransaction tx = session.BeginTransaction())
+				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
 					{
@@ -57,7 +53,7 @@ public void InvalidatesEntities()
 					tx.Commit();
 				}
 
-				using (ITransaction tx = session.BeginTransaction())
+				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
 					{
@@ -68,7 +64,7 @@ public void InvalidatesEntities()
 					tx.Commit();
 				}
 
-				using (ITransaction tx = session.BeginTransaction())
+				using (var tx = session.BeginTransaction())
 				{
 					foreach (var i in Enumerable.Range(1, 10))
 					{
@@ -81,28 +77,21 @@ public void InvalidatesEntities()
 			}
 
 			//Should receive one preinvalidation and one invalidation per commit
-			Assert.That(preInvalidations.Count,Is.EqualTo(3));
-			Assert.That(preInvalidations.All(x => x.Count == 1 && x.First() == "Item"), Is.True);
-
-			Assert.That(invalidations.Count, Is.EqualTo(3));
-			Assert.That(invalidations.All(x => x.Count == 1 && x.First() == "Item"), Is.True);
+			Assert.That(preInvalidations, Has.Count.EqualTo(3));
+			Assert.That(preInvalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 
+			Assert.That(invalidations, Has.Count.EqualTo(3));
+			Assert.That(invalidations, Has.All.Count.EqualTo(1).And.Contains("Item"));
 		}
-		
-		public void CleanUp()
+
+		protected override void OnTearDown()
 		{
-			using (ISession s = OpenSession())
-			using (ITransaction tx = s.BeginTransaction())
+			using (var s = OpenSession())
+			using (var tx = s.BeginTransaction())
 			{
 				s.Delete("from Item");
 				tx.Commit();
 			}
 		}
-
-		protected override void OnTearDown()
-		{
-			CleanUp();
-			base.OnTearDown();
-		}
 	}
 }