Merge branch 'master' into Unicode

fredericDelaporte · web-flow · commit 0db37d8226e2 · 2018-01-04T22:36:43.000+01:00
diff --git a/src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs b/src/NHibernate.Test/Async/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs
@@ -39,8 +39,8 @@ public async Task CanRetrieveReservedWordsAsync()
 				var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
 				var reserved = metaData.GetReservedWords();
 				Assert.That(reserved, Is.Not.Empty);
-				Assert.That(reserved, Has.Member("SELECT").IgnoreCase);
-				Assert.That(reserved, Has.Member("FROM").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("SELECT").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("FROM").IgnoreCase);
 			}
 			finally
 			{
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -41,12 +41,12 @@
     <PackageReference Include="Microsoft.SqlServer.Compact" Version="4.0.8876.1" />
     <PackageReference Include="MySql.Data" Version="6.9.10" />
     <PackageReference Include="Npgsql" Version="3.2.4.1" />
-    <PackageReference Include="nunit" Version="3.7.1" />
     <PackageReference Include="Oracle.ManagedDataAccess" Version="12.1.2400" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.105.2" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.6" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="NUnit" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(NuGetPackageRoot)' != '' ">
     <NativeBinaries Include="$(NuGetPackageRoot)microsoft.sqlserver.compact\4.0.8876.1\NativeBinaries\**\*.*" />
diff --git a/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs b/src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs
@@ -27,8 +27,8 @@ public void CanRetrieveReservedWords()
 				var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);
 				var reserved = metaData.GetReservedWords();
 				Assert.That(reserved, Is.Not.Empty);
-				Assert.That(reserved, Has.Member("SELECT").IgnoreCase);
-				Assert.That(reserved, Has.Member("FROM").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("SELECT").IgnoreCase);
+				Assert.That(reserved, Has.Some.EqualTo("FROM").IgnoreCase);
 			}
 			finally
 			{
diff --git a/src/NHibernate/Async/Loader/Loader.cs b/src/NHibernate/Async/Loader/Loader.cs
@@ -843,7 +843,6 @@ protected async Task<DbDataReader> GetResultSetAsync(DbCommand st, bool autoDisc
 			DbDataReader rs = null;
 			try
 			{
-				Log.Info(st.CommandText);
 				// TODO NH: Callable
 				rs = await (session.Batcher.ExecuteReaderAsync(st, cancellationToken)).ConfigureAwait(false);
 
diff --git a/src/NHibernate/Loader/Loader.cs b/src/NHibernate/Loader/Loader.cs
@@ -1271,7 +1271,6 @@ protected DbDataReader GetResultSet(DbCommand st, bool autoDiscoverTypes, bool c
 			DbDataReader rs = null;
 			try
 			{
-				Log.Info(st.CommandText);
 				// TODO NH: Callable
 				rs = session.Batcher.ExecuteReader(st);
 

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ public async Task CanRetrieveReservedWordsAsync()`
`39`	`39`	`var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);`
`40`	`40`	`var reserved = metaData.GetReservedWords();`
`41`	`41`	`Assert.That(reserved, Is.Not.Empty);`
`42`		`- Assert.That(reserved, Has.Member("SELECT").IgnoreCase);`
`43`		`- Assert.That(reserved, Has.Member("FROM").IgnoreCase);`
	`42`	`+ Assert.That(reserved, Has.Some.EqualTo("SELECT").IgnoreCase);`
	`43`	`+ Assert.That(reserved, Has.Some.EqualTo("FROM").IgnoreCase);`
`44`	`44`	`}`
`45`	`45`	`finally`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ public void CanRetrieveReservedWords()`
`27`	`27`	`var metaData = dialect.GetDataBaseSchema(connectionHelper.Connection);`
`28`	`28`	`var reserved = metaData.GetReservedWords();`
`29`	`29`	`Assert.That(reserved, Is.Not.Empty);`
`30`		`- Assert.That(reserved, Has.Member("SELECT").IgnoreCase);`
`31`		`- Assert.That(reserved, Has.Member("FROM").IgnoreCase);`
	`30`	`+ Assert.That(reserved, Has.Some.EqualTo("SELECT").IgnoreCase);`
	`31`	`+ Assert.That(reserved, Has.Some.EqualTo("FROM").IgnoreCase);`
`32`	`32`	`}`
`33`	`33`	`finally`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,6 @@ protected async Task<DbDataReader> GetResultSetAsync(DbCommand st, bool autoDisc`
`843`	`843`	`DbDataReader rs = null;`
`844`	`844`	`try`
`845`	`845`	`{`
`846`		`- Log.Info(st.CommandText);`
`847`	`846`	`// TODO NH: Callable`
`848`	`847`	`rs = await (session.Batcher.ExecuteReaderAsync(st, cancellationToken)).ConfigureAwait(false);`
`849`	`848`
Original file line number	Diff line number	Diff line change
`@@ -1271,7 +1271,6 @@ protected DbDataReader GetResultSet(DbCommand st, bool autoDiscoverTypes, bool c`
`1271`	`1271`	`DbDataReader rs = null;`
`1272`	`1272`	`try`
`1273`	`1273`	`{`
`1274`		`- Log.Info(st.CommandText);`
`1275`	`1274`	`// TODO NH: Callable`
`1276`	`1275`	`rs = session.Batcher.ExecuteReader(st);`
`1277`	`1276`