NH-3905 - fixes required in tests for their async counterparts.

Author: fredericDelaporte

src/AsyncGenerator.yml

@@ -156,8 +156,6 @@
   applyChanges: true
   analyzation:
     methodConversion:
-    - conversion: Ignore
-      hasAttributeName: IgnoreAttribute
     - conversion: Smart
       hasAttributeName: TestAttribute
     - conversion: Smart
@@ -250,4 +248,4 @@ typeRules:
   name: IsTestCase
 - filters:
   - hasAttributeName: TestFixtureAttribute
-  name: HasTestFixtureAttribute
+  name: HasTestFixtureAttribute

src/NHibernate.Test/Events/Collections/CollectionListeners.cs

@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using NHibernate.Event;
 using NHibernate.Event.Default;
 
@@ -158,6 +160,15 @@ public override void OnInitializeCollection(InitializeCollectionEvent @event)
 				base.OnInitializeCollection(@event);
 				AddEvent(@event, this);
 			}
+
+			public override Task OnInitializeCollectionAsync(InitializeCollectionEvent @event, CancellationToken cancellationToken)
+			{
+				var result = base.OnInitializeCollectionAsync(@event, cancellationToken);
+
+				AddEvent(@event, this);
+
+				return result;
+			}
 		}
 
 		#endregion
@@ -270,4 +281,4 @@ public void OnPreUpdateCollection(PreCollectionUpdateEvent @event)
 
 		#endregion
 	}
-}
+}

src/NHibernate.Test/Insertordering/InsertOrderingFixture.cs

@@ -4,6 +4,8 @@
 using System.Data;
 using System.Data.Common;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NHibernate.Dialect;
@@ -13,6 +15,8 @@
 using NHibernate.SqlTypes;
 using NUnit.Framework;
 
+using AsyncTask = System.Threading.Tasks.Task;
+
 namespace NHibernate.Test.Insertordering
 {
 	[TestFixture]
@@ -559,10 +563,26 @@ public override DbCommand PrepareBatchCommand(CommandType type, SqlString sql, S
 			{
 				var result = base.PrepareBatchCommand(type, sql, parameterTypes);
 
+				PrepareStats(sql);
+
+				return result;
+			}
+
+			public override Task<DbCommand> PrepareBatchCommandAsync(CommandType type, SqlString sql, SqlType[] parameterTypes, CancellationToken cancellationToken)
+			{
+				var result = base.PrepareBatchCommandAsync(type, sql, parameterTypes, cancellationToken);
+
+				PrepareStats(sql);
+
+				return result;
+			}
+
+			private static void PrepareStats(SqlString sql)
+			{
 				if (!StatsEnabled)
-					return result;
+					return;
 
-				string sqlstring = sql.ToString();
+				var sqlstring = sql.ToString();
 				if (batchSQL == null || !sqlstring.Equals(batchSQL))
 				{
 					currentBatch++;
@@ -571,29 +591,50 @@ public override DbCommand PrepareBatchCommand(CommandType type, SqlString sql, S
 					Console.WriteLine("--------------------------------------------------------");
 					Console.WriteLine("Preparing statement [" + batchSQL + "]");
 				}
-				return result;
 			}
 
 			public override void AddToBatch(IExpectation expectation)
 			{
-				if (StatsEnabled)
-				{
-					batchSizes[currentBatch]++;
-					Console.WriteLine("Adding to batch [" + batchSQL + "]");
-				}
+				AddStats();
 				base.AddToBatch(expectation);
 			}
 
+			public override AsyncTask AddToBatchAsync(IExpectation expectation, CancellationToken cancellationToken)
+			{
+				AddStats();
+				return base.AddToBatchAsync(expectation, cancellationToken);
+			}
+
+			private static void AddStats()
+			{
+				if (!StatsEnabled)
+					return;
+
+				batchSizes[currentBatch]++;
+				Console.WriteLine("Adding to batch [" + batchSQL + "]");
+			}
+
 			protected override void DoExecuteBatch(DbCommand ps)
 			{
-				if (StatsEnabled)
-				{
-					Console.WriteLine("executing batch [" + batchSQL + "]");
-					Console.WriteLine("--------------------------------------------------------");
-				}
-				batchSQL = null;
+				ExecuteStats();
 				base.DoExecuteBatch(ps);
 			}
+
+			protected override AsyncTask DoExecuteBatchAsync(DbCommand ps, CancellationToken cancellationToken)
+			{
+				ExecuteStats();
+				return base.DoExecuteBatchAsync(ps, cancellationToken);
+			}
+
+			private static void ExecuteStats()
+			{
+				if (!StatsEnabled)
+					return;
+
+				Console.WriteLine("executing batch [" + batchSQL + "]");
+				Console.WriteLine("--------------------------------------------------------");
+				batchSQL = null;
+			}
 		}
 
 		#endregion

src/NHibernate.Test/Linq/ByMethod/CastTests.cs

@@ -1,5 +1,8 @@
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using NHibernate.DomainModel.Northwind.Entities;
+using NHibernate.Exceptions;
 using NHibernate.Linq;
 using NUnit.Framework;
 
@@ -30,8 +33,10 @@ where a.Pregnant
 		public void CastDowncast()
 		{
 			var query = session.Query<Mammal>().Cast<Dog>();
+			List<Dog> list;
 			// the list contains at least one Cat then should Throws
-			Assert.That(() => query.ToList(), Throws.Exception);
+			// Do not use bare Throws.Exception due to https://github.com/nunit/nunit/issues/1899
+			Assert.That(() => list = query.ToList(), Throws.InstanceOf<GenericADOException>());
 		}
 
 		[Test]
@@ -47,7 +52,8 @@ public void CastDowncastUsingOfType()
 		{
 			var query = session.Query<Animal>().OfType<Mammal>().Cast<Dog>();
 			// the list contains at least one Cat then should Throws
-			Assert.That(() => query.ToList(), Throws.Exception);
+			// Do not use bare Throws.Exception due to https://github.com/nunit/nunit/issues/1899
+			Assert.That(() => query.ToList(), Throws.InstanceOf<Exception>());
 		}
 	}
 }

src/NHibernate.Test/Linq/QueryTimeoutTests.cs

@@ -1,5 +1,7 @@
 using System.Data.Common;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NHibernate.Dialect;
@@ -105,6 +107,12 @@ public override DbDataReader ExecuteReader(DbCommand cmd)
 				LastCommandTimeout = cmd.CommandTimeout;
 				return base.ExecuteReader(cmd);
 			}
+
+			public override Task<DbDataReader> ExecuteReaderAsync(DbCommand cmd, CancellationToken cancellationToken)
+			{
+				LastCommandTimeout = cmd.CommandTimeout;
+				return base.ExecuteReaderAsync(cmd, cancellationToken);
+			}
 		}
 
 

src/NHibernate.Test/MappingByCode/IntegrationTests/NH3269/FixtureNonPublicProperty.cs

@@ -1,4 +1,5 @@
-using NHibernate.Cfg.MappingSchema;
+using System;
+using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping.ByCode;
 using NUnit.Framework;
 
@@ -16,7 +17,8 @@ public void ShouldThrowExceptionWhenTryingToSaveInherited1WithDuplicateName()
 				var e1 = new Inherited1 { Name = "Bob" };
 				session.Save(e1);
 
-				Assert.That(() => { transaction.Commit(); }, Throws.Exception);
+				// Do not use bare Throws.Exception due to https://github.com/nunit/nunit/issues/1899
+				Assert.That(() => { transaction.Commit(); }, Throws.InstanceOf<Exception>());
 			}
 		}
 

src/NHibernate.Test/MappingByCode/IntegrationTests/NH3269/FixturePublicProperty.cs

@@ -1,4 +1,5 @@
-using NHibernate.Cfg.MappingSchema;
+using System;
+using NHibernate.Cfg.MappingSchema;
 using NHibernate.Mapping.ByCode;
 using NUnit.Framework;
 
@@ -16,7 +17,8 @@ public void ShouldThrowExceptionWhenTryingToSaveInherited1WithDuplicateName()
 				var e1 = new Inherited1 { Name = "Bob" };
 				session.Save(e1);
 
-				Assert.That(() => { transaction.Commit(); }, Throws.Exception);
+				// Do not use bare Throws.Exception due to https://github.com/nunit/nunit/issues/1899
+				Assert.That(() => { transaction.Commit(); }, Throws.InstanceOf<Exception>());
 			}
 		}
 

src/NHibernate.Test/NHSpecificTest/NH1421/Fixture.cs

@@ -47,7 +47,7 @@ public void WhenParameterListIsNullUsingQueryThenTrowsArgumentException()
 			using (var s = OpenSession())
 			{
 				var query = s.CreateQuery("from AnEntity a where a.id in (:myList)");
-				Assert.That(() => query.SetParameterList("myList", null), Throws.Exception.InstanceOf<ArgumentNullException>());
+				Assert.That(() => query.SetParameterList("myList", null), Throws.InstanceOf<ArgumentNullException>());
 			}
 		}