Fix tests for 5.3.x language support

Author: fredericDelaporte

src/NHibernate.Test/Async/NHSpecificTest/GH3291/Fixture.cs

@@ -10,7 +10,6 @@
 
 using System;
 using System.Linq;
-using NHibernate.Criterion;
 using NUnit.Framework;
 using NHibernate.Linq;
 
@@ -22,58 +21,62 @@ public class FixtureAsync : BugTestCase
 	{
 		protected override void OnSetUp()
 		{
-			using var session = OpenSession();
-			using var transaction = session.BeginTransaction();
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new Person { Name = "Bob", DateOfBirth = new DateTime(2009, 12, 23) };
+				session.Save(e1);
 
-			var e1 = new Person { Name = "Bob", DateOfBirth = new DateTime(2009, 12, 23) };
-			session.Save(e1);
+				var e2 = new Person { Name = "Sally", DateOfBirth = new DateTime(2018, 9, 30) };
+				session.Save(e2);
 
-			var e2 = new Person { Name = "Sally", DateOfBirth = new DateTime(2018, 9, 30) };
-			session.Save(e2);
-
-			transaction.Commit();
+				transaction.Commit();
+			}
 		}
 
 		protected override void OnTearDown()
 		{
-			using var session = OpenSession();
-			using var transaction = session.BeginTransaction();
-
-			session.CreateQuery("delete from System.Object").ExecuteUpdate();
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
 
-			transaction.Commit();
+				transaction.Commit();
+			}
 		}
 
 		[Test]
 		public async Task LinqAsync()
 		{
-			using var session = OpenSession();
-			using var _ = session.BeginTransaction();
-
-			DateTime? dateOfSearch = null;
-
-			var result = await ((
-				from person in session.Query<Person>()
-				where dateOfSearch == null || person.DateOfBirth > dateOfSearch
-				select person).ToListAsync());
-
-			Assert.That(result, Has.Count.EqualTo(2));
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				DateTime? dateOfSearch = null;
+
+				var result = await ((
+					from person in session.Query<Person>()
+					where dateOfSearch == null || person.DateOfBirth > dateOfSearch
+					select person).ToListAsync());
+
+				Assert.That(result, Has.Count.EqualTo(2));
+			}
 		}
 
 		[Test]
 		public async Task HqlAsync()
 		{
-			using var session = OpenSession();
-			using var _ = session.BeginTransaction();
-
-			DateTime? dateOfSearch = null;
-
-			var result =
-				await (session.CreateQuery("from Person where :DateOfSearch is null OR DateOfBirth > :DateOfSearch")
-				    .SetParameter("DateOfSearch", dateOfSearch, NHibernateUtil.DateTime)
-				    .ListAsync<Person>());
-
-			Assert.That(result, Has.Count.EqualTo(2));
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				DateTime? dateOfSearch = null;
+
+				var result =
+					await (session.CreateQuery("from Person where :DateOfSearch is null OR DateOfBirth > :DateOfSearch")
+						.SetParameter("DateOfSearch", dateOfSearch, NHibernateUtil.DateTime)
+						.ListAsync<Person>());
+
+				Assert.That(result, Has.Count.EqualTo(2));
+			}
 		}
 	}
 }

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

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using NHibernate.Criterion;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.GH3291
@@ -10,58 +9,62 @@ public class Fixture : BugTestCase
 	{
 		protected override void OnSetUp()
 		{
-			using var session = OpenSession();
-			using var transaction = session.BeginTransaction();
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				var e1 = new Person { Name = "Bob", DateOfBirth = new DateTime(2009, 12, 23) };
+				session.Save(e1);
 
-			var e1 = new Person { Name = "Bob", DateOfBirth = new DateTime(2009, 12, 23) };
-			session.Save(e1);
+				var e2 = new Person { Name = "Sally", DateOfBirth = new DateTime(2018, 9, 30) };
+				session.Save(e2);
 
-			var e2 = new Person { Name = "Sally", DateOfBirth = new DateTime(2018, 9, 30) };
-			session.Save(e2);
-
-			transaction.Commit();
+				transaction.Commit();
+			}
 		}
 
 		protected override void OnTearDown()
 		{
-			using var session = OpenSession();
-			using var transaction = session.BeginTransaction();
-
-			session.CreateQuery("delete from System.Object").ExecuteUpdate();
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				session.CreateQuery("delete from System.Object").ExecuteUpdate();
 
-			transaction.Commit();
+				transaction.Commit();
+			}
 		}
 
 		[Test]
 		public void Linq()
 		{
-			using var session = OpenSession();
-			using var _ = session.BeginTransaction();
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				DateTime? dateOfSearch = null;
 
-			DateTime? dateOfSearch = null;
+				var result = (
+					from person in session.Query<Person>()
+					where dateOfSearch == null || person.DateOfBirth > dateOfSearch
+					select person).ToList();
 
-			var result = (
-				from person in session.Query<Person>()
-				where dateOfSearch == null || person.DateOfBirth > dateOfSearch
-				select person).ToList();
-
-			Assert.That(result, Has.Count.EqualTo(2));
+				Assert.That(result, Has.Count.EqualTo(2));
+			}
 		}
 
 		[Test]
 		public void Hql()
 		{
-			using var session = OpenSession();
-			using var _ = session.BeginTransaction();
-
-			DateTime? dateOfSearch = null;
+			using (var session = OpenSession())
+			using (session.BeginTransaction())
+			{
+				DateTime? dateOfSearch = null;
 
-			var result =
-				session.CreateQuery("from Person where :DateOfSearch is null OR DateOfBirth > :DateOfSearch")
-				    .SetParameter("DateOfSearch", dateOfSearch, NHibernateUtil.DateTime)
-				    .List<Person>();
+				var result =
+					session.CreateQuery("from Person where :DateOfSearch is null OR DateOfBirth > :DateOfSearch")
+						.SetParameter("DateOfSearch", dateOfSearch, NHibernateUtil.DateTime)
+						.List<Person>();
 
-			Assert.That(result, Has.Count.EqualTo(2));
+				Assert.That(result, Has.Count.EqualTo(2));
+			}
 		}
 	}
 }