Upgrade to AsyncGenerator 0.8.2.6

- Enable AlwaysAwait for test methods.

Author: hazzik

.gitignore

@@ -13,3 +13,4 @@ current-test-configuration
 NHibernate.dll
 TestResult.xml
 .vscode
+.DS_Store

Tools/packages.config

@@ -7,7 +7,7 @@
   <package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
   <package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
   <package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
-  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.4" targetFramework="net461" />
+  <package id="CSharpAsyncGenerator.CommandLine" version="0.8.2.6" targetFramework="net461" />
   <package id="vswhere" version="2.1.4" targetFramework="net461" />
   <package id="gitreleasemanager" version="0.7.0" targetFramework="net461" />
 </packages>

src/AsyncGenerator.yml

@@ -189,6 +189,11 @@
     preserveReturnType:
     - hasAttributeName: TestAttribute
     - hasAttributeName: TheoryAttribute
+    alwaysAwait:
+    - hasAttributeName: TestAttribute
+    - hasAttributeName: TheoryAttribute
+    - hasAttributeName: SetUpAttribute
+    - hasAttributeName: TearDownAttribute
     typeConversion:
     - conversion: Ignore
       name: ObjectAssert

src/NHibernate.Test/Async/CacheTest/CacheFixture.cs

@@ -22,9 +22,9 @@ namespace NHibernate.Test.CacheTest
 	public class CacheFixtureAsync
 	{
 		[Test]
-		public Task TestSimpleCacheAsync()
+		public async Task TestSimpleCacheAsync()
 		{
-			return DoTestCacheAsync(new HashtableCacheProvider());
+			await (DoTestCacheAsync(new HashtableCacheProvider()));
 		}
 
 		private CacheKey CreateCacheKey(string text)

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

@@ -65,11 +65,9 @@ public async Task ManualConfigurationAsync()
 		/// <see cref="Configuration" /> works as intended.
 		/// </summary>
 		[Test]
-		public Task SetDefaultAssemblyAndNamespaceAsync()
+		public async Task SetDefaultAssemblyAndNamespaceAsync()
 		{
-			try
-			{
-				string hbmFromDomainModel =
+			string hbmFromDomainModel =
 				@"<?xml version='1.0' ?>
 <hibernate-mapping xmlns='urn:nhibernate-mapping-2.2'>
 	<class name='A'>
@@ -79,7 +77,7 @@ public Task SetDefaultAssemblyAndNamespaceAsync()
 	</class>
 </hibernate-mapping>";
 
-				string hbmFromTest =
+			string hbmFromTest =
 				@"<?xml version='1.0' ?>
 <hibernate-mapping xmlns='urn:nhibernate-mapping-2.2'>
 	<class name='LocatedInTestAssembly' lazy='false'>
@@ -89,23 +87,18 @@ public Task SetDefaultAssemblyAndNamespaceAsync()
 	</class>
 </hibernate-mapping>";
 
-				Configuration cfg = new Configuration();
-				cfg
+			Configuration cfg = new Configuration();
+			cfg
 				.SetDefaultAssembly("NHibernate.DomainModel")
 				.SetDefaultNamespace("NHibernate.DomainModel")
 				.AddXmlString(hbmFromDomainModel);
 
-				cfg
+			cfg
 				.SetDefaultAssembly("NHibernate.Test")
 				.SetDefaultNamespace(typeof(LocatedInTestAssembly).Namespace)
 				.AddXmlString(hbmFromTest);
 
-				return cfg.BuildSessionFactory().CloseAsync();
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
+			await (cfg.BuildSessionFactory().CloseAsync());
 		}
 
 		public class SampleQueryProvider : DefaultQueryProvider

src/NHibernate.Test/Async/Criteria/DetachedCriteriaSerializable.cs

@@ -46,18 +46,11 @@ protected override IList Mappings
 		}
 
 		[Test]
-		public Task DetachedCriteriaItSelfAsync()
+		public async Task DetachedCriteriaItSelfAsync()
 		{
-			try
-			{
-				DetachedCriteria dc = DetachedCriteria.For(typeof(Student))
+			DetachedCriteria dc = DetachedCriteria.For(typeof(Student))
 				.Add(Expression.Eq("Name", "Gavin King"));
-				return SerializeAndListAsync(dc);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
+			await (SerializeAndListAsync(dc));
 		}
 
 		[Test]

src/NHibernate.Test/Async/EntityModeTest/Map/Basic/DynamicClassFixture.cs

@@ -36,19 +36,19 @@ protected override IList Mappings
 		public delegate IList AllModelQueryDelegate(ISession session);
 
 		[Test]
-		public Task ShouldWorkWithHQLAsync()
+		public async Task ShouldWorkWithHQLAsync()
 		{
-			return TestLazyDynamicClassAsync(
+			await (TestLazyDynamicClassAsync(
 				s => (IDictionary) s.CreateQuery("from ProductLine pl order by pl.Description").UniqueResult(),
-				s => s.CreateQuery("from Model m").List());
+				s => s.CreateQuery("from Model m").List()));
 		}
 
 		[Test]
-		public Task ShouldWorkWithCriteriaAsync()
+		public async Task ShouldWorkWithCriteriaAsync()
 		{
-			return TestLazyDynamicClassAsync(
+			await (TestLazyDynamicClassAsync(
 				s => (IDictionary) s.CreateCriteria("ProductLine").AddOrder(Order.Asc("Description")).UniqueResult(),
-				s => s.CreateCriteria("Model").List());
+				s => s.CreateCriteria("Model").List()));
 		}
 
 		public async Task TestLazyDynamicClassAsync(SingleCarQueryDelegate singleCarQueryHandler, AllModelQueryDelegate allModelQueryHandler, CancellationToken cancellationToken = default(CancellationToken))

src/NHibernate.Test/Async/Legacy/SQLLoaderTest.cs

@@ -439,16 +439,16 @@ public async Task EmbeddedCompositePropertiesAsync()
 		}
 
 		[Test]
-		public Task ComponentStarAsync()
+		public async Task ComponentStarAsync()
 		{
-			return ComponentTestAsync("select {comp.*} from Componentizable comp");
+			await (ComponentTestAsync("select {comp.*} from Componentizable comp"));
 		}
 
 		[Test]
-		public Task ComponentNoStarAsync()
+		public async Task ComponentNoStarAsync()
 		{
-			return ComponentTestAsync(
-				"select comp.Id as {comp.id}, comp.nickName as {comp.NickName}, comp.Name as {comp.Component.Name}, comp.SubName as {comp.Component.SubComponent.SubName}, comp.SubName1 as {comp.Component.SubComponent.SubName1} from Componentizable comp");
+			await (ComponentTestAsync(
+				"select comp.Id as {comp.id}, comp.nickName as {comp.NickName}, comp.Name as {comp.Component.Name}, comp.SubName as {comp.Component.SubComponent.SubName}, comp.SubName1 as {comp.Component.SubComponent.SubName1} from Componentizable comp"));
 		}
 
 		private async Task ComponentTestAsync(string sql, CancellationToken cancellationToken = default(CancellationToken))

src/NHibernate.Test/Async/Linq/ByMethod/GroupByTests.cs

@@ -904,19 +904,12 @@ public override int GetHashCode()
 
 
 		[Test(Description = "NH-3446"), KnownBug("NH-3446", "NHibernate.HibernateException")]
-		public Task GroupByOrderByKeySelectToClassAsync()
+		public async Task GroupByOrderByKeySelectToClassAsync()
 		{
-			try
-			{
-				return db.Products.GroupBy(x => x.Supplier.CompanyName)
+			await (db.Products.GroupBy(x => x.Supplier.CompanyName)
 				.OrderBy(x => x.Key)
 				.Select(x => new GroupInfo {Key = x.Key, ItemCount = x.Count(), HasSubgroups = false, Items = x})
-				.ToListAsync();
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
+				.ToListAsync());
 		}
 
 		private class GroupInfo

src/NHibernate.Test/Async/Linq/ByMethod/OrderByTests.cs

@@ -232,29 +232,15 @@ orderby order.ShippingDate descending
 		}
 
 		[Test(Description = "NH-3217")]
-		public Task OrderByNullCompareAndSkipAndTakeAsync()
+		public async Task OrderByNullCompareAndSkipAndTakeAsync()
 		{
-			try
-			{
-				return db.Orders.OrderBy(o => o.Shipper == null ? 0 : o.Shipper.ShipperId).Skip(3).Take(4).ToListAsync();
-			}
-			catch (System.Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
+			await (db.Orders.OrderBy(o => o.Shipper == null ? 0 : o.Shipper.ShipperId).Skip(3).Take(4).ToListAsync());
 		}
 
 		[Test(Description = "NH-3445"), KnownBug("NH-3445")]
-		public Task OrderByWithSelectDistinctAndTakeAsync()
+		public async Task OrderByWithSelectDistinctAndTakeAsync()
 		{
-			try
-			{
-				return db.Orders.Select(o => o.ShippedTo).Distinct().OrderBy(o => o).Take(1000).ToListAsync();
-			}
-			catch (System.Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
+			await (db.Orders.Select(o => o.ShippedTo).Distinct().OrderBy(o => o).Take(1000).ToListAsync());
 		}
 	}
 }