Modifications after code review

Author: gliljas

src/NHibernate.Test/Async/NHSpecificTest/NH3403/Fixture.cs renamed to src/NHibernate.Test/Async/NHSpecificTest/GH1300/Fixture.cs

@@ -19,9 +19,10 @@
 using NHibernate.Engine;
 using NHibernate.Exceptions;
 using NHibernate.Linq;
+using NHibernate.Type;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.NH3403
+namespace NHibernate.Test.NHSpecificTest.GH1300
 {
 	using System.Threading.Tasks;
 	using System.Threading;
@@ -51,8 +52,8 @@ protected override void Configure(Configuration configuration)
 
 		protected override void OnTearDown()
 		{
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				session.Delete("from System.Object");
 
@@ -64,8 +65,8 @@ protected override void OnTearDown()
 		protected override void OnSetUp()
 		{
 			base.OnSetUp();
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				var e1 = new Entity { Name = "Bob" };
 				session.Save(e1);
@@ -78,16 +79,16 @@ public async Task InsertShouldUseMappedSizeAsync()
 		{
 			Driver.ClearCommands();
 
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				var e1 = new Entity { Name = "Al", AnsiName = "Al" };
 				await (session.SaveAsync(e1));
 				await (transaction.CommitAsync());
-				Assert.AreEqual(SqlDbType.NVarChar, Driver.LastCommandParameters.First().SqlDbType);
-				Assert.AreEqual(3, Driver.LastCommandParameters.First().Size);
-				Assert.AreEqual(SqlDbType.VarChar, Driver.LastCommandParameters.Last().SqlDbType);
-				Assert.AreEqual(3, Driver.LastCommandParameters.Last().Size);
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.NVarChar));
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(3));
+				Assert.That(Driver.LastCommandParameters.Last().SqlDbType, Is.EqualTo(SqlDbType.VarChar));
+				Assert.That(Driver.LastCommandParameters.Last().Size, Is.EqualTo(3));
 			}
 		}
 
@@ -96,8 +97,8 @@ public void InsertWithTooLongValuesShouldThrowAsync()
 		{
 			Driver.ClearCommands();
 
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				var e1 = new Entity { Name = "Alal", AnsiName = "Alal" };
 
@@ -109,7 +110,7 @@ public void InsertWithTooLongValuesShouldThrowAsync()
 					});
 
 				var sqlEx = ex.InnerException as SqlException;
-				Assert.IsNotNull(sqlEx);
+				Assert.That(sqlEx, Is.Not.Null);
 				Assert.That(sqlEx.Number, Is.EqualTo(8152));
 			}
 		}
@@ -120,8 +121,8 @@ public void InsertWithTooLongValuesShouldThrowAsync()
 		{
 			Driver.ClearCommands();
 
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				if (property == "Name")
 				{
@@ -131,24 +132,59 @@ public void InsertWithTooLongValuesShouldThrowAsync()
 				{
 					await (session.Query<Entity>().Where(x => x.AnsiName == "Bob").ToListAsync(cancellationToken));
 				}
-				Assert.AreEqual(3, Driver.LastCommandParameters.First().Size);
-				Assert.AreEqual(expectedDbType, Driver.LastCommandParameters.First().SqlDbType);
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(3));
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(expectedDbType));
 			}
 		}
-		
+
+		[Test]
+		public async Task MappedAsShouldUseExplicitSizeAsync()
+		{
+			Driver.ClearCommands();
+
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				await (session.Query<Entity>().Where(x => x.Name == "Bob".MappedAs(TypeFactory.Basic("AnsiString(200)"))).ToListAsync());
+
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(200));
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.VarChar));
+			}
+		}
+
+		[Test]
+		public async Task LongStringCausesClobSizedParameterAsync()
+		{
+			Driver.ClearCommands();
+
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
+			{
+				await (session.Query<Entity>().Where(x => x.Name == new string('x', MsSql2000Dialect.MaxSizeForLengthLimitedString + 1)).ToListAsync());
+
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(MsSql2000Dialect.MaxSizeForClob));
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.NVarChar));
+
+				await (session.Query<Entity>().Where(x => x.AnsiName == new string('x', MsSql2000Dialect.MaxSizeForLengthLimitedAnsiString + 1)).ToListAsync());
+
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.EqualTo(MsSql2000Dialect.MaxSizeForAnsiClob));
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(SqlDbType.VarChar));
+			}
+		}
+
 		[TestCase("Name", SqlDbType.NVarChar)]
 		[TestCase("AnsiName", SqlDbType.VarChar)]
 		public async Task HqlLikeShouldUseLargerSizeAsync(string property, SqlDbType expectedDbType, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			Driver.ClearCommands();
 
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				await (session.CreateQuery("from Entity where " + property + " like :name").SetParameter("name", "%Bob%").ListAsync<Entity>(cancellationToken));
 
-				Assert.GreaterOrEqual(Driver.LastCommandParameters.First().Size, 5);
-				Assert.AreEqual(expectedDbType, Driver.LastCommandParameters.First().SqlDbType);
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.GreaterThanOrEqualTo(5));
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(expectedDbType));
 			}
 		}
 
@@ -158,38 +194,35 @@ public void InsertWithTooLongValuesShouldThrowAsync()
 		{
 			Driver.ClearCommands();
 
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				Driver.ClearCommands();
 
 				await (session.CreateCriteria<Entity>().Add(Restrictions.Eq(property, "Bob"))
 								  .ListAsync<Entity>(cancellationToken));
 
-				Assert.GreaterOrEqual(Driver.LastCommandParameters.First().Size, 3);
-				Assert.AreEqual(expectedDbType, Driver.LastCommandParameters.First().SqlDbType);
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.GreaterThanOrEqualTo(3));
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(expectedDbType));
 			}
 		}
-		
+
 		[TestCase("Name", SqlDbType.NVarChar)]
 		[TestCase("AnsiName", SqlDbType.VarChar)]
 		public async Task CriteriaLikeShouldUseLargerSizeAsync(string property, SqlDbType expectedDbType, CancellationToken cancellationToken = default(CancellationToken))
 		{
 			Driver.ClearCommands();
 
-			using (ISession session = OpenSession())
-			using (ITransaction transaction = session.BeginTransaction())
+			using (var session = OpenSession())
+			using (var transaction = session.BeginTransaction())
 			{
 				await (session.CreateCriteria<Entity>().Add(Restrictions.Like(property, "%Bob%"))
 								  .ListAsync<Entity>(cancellationToken));
 
-				Assert.GreaterOrEqual(Driver.LastCommandParameters.First().Size, 5);
-				Assert.AreEqual(expectedDbType, Driver.LastCommandParameters.First().SqlDbType);
+				Assert.That(Driver.LastCommandParameters.First().Size, Is.GreaterThanOrEqualTo(5));
+				Assert.That(Driver.LastCommandParameters.First().SqlDbType, Is.EqualTo(expectedDbType));
 			}
 		}
-		private TestSqlClientDriver Driver
-		{
-			get { return Sfi.ConnectionProvider.Driver as TestSqlClientDriver; }
-		}
+		private TestSqlClientDriver Driver => Sfi.ConnectionProvider.Driver as TestSqlClientDriver;
 	}
 }

src/NHibernate.Test/NHSpecificTest/NH3403/Entity.cs renamed to src/NHibernate.Test/NHSpecificTest/GH1300/Entity.cs

@@ -1,4 +1,4 @@
-namespace NHibernate.Test.NHSpecificTest.NH3403
+namespace NHibernate.Test.NHSpecificTest.GH1300
 {
 	class Entity
 	{