NH-4030 - Moving futures tests outside of NHSpecificTest

fredericDelaporte · fredericDelaporte · commit 5b36712bfdb3 · 2017-06-18T15:32:54.000+02:00
diff --git a/src/NHibernate.Test/Futures/FallbackFixture.cs b/src/NHibernate.Test/Futures/FallbackFixture.cs
@@ -2,21 +2,17 @@
 using NHibernate.Cfg;
 using NHibernate.Connection;
 using NHibernate.Criterion;
-using NHibernate.Dialect;
 using NHibernate.Driver;
 using NHibernate.Linq;
 using NUnit.Framework;
 
-using Environment=NHibernate.Cfg.Environment;
+using Environment = NHibernate.Cfg.Environment;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public class TestDriverThatDoesntSupportQueryBatching : SqlClientDriver
 	{
-		public override bool SupportsMultipleQueries
-		{
-			get { return false; }
-		}
+		public override bool SupportsMultipleQueries => false;
 	}
 
 	/// <summary>
diff --git a/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs b/src/NHibernate.Test/Futures/FutureCriteriaFixture.cs
@@ -1,9 +1,8 @@
 using System.Linq;
 using NHibernate.Criterion;
-using NHibernate.Impl;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
     [TestFixture]
     public class FutureCriteriaFixture : FutureFixture
diff --git a/src/NHibernate.Test/Futures/FutureFixture.cs b/src/NHibernate.Test/Futures/FutureFixture.cs
@@ -1,16 +1,14 @@
 using System.Collections;
-using NHibernate.Driver;
-using NHibernate.Impl;
 
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public abstract class FutureFixture : TestCase
 	{
 		protected override IList Mappings
 		{
-			get { return new[] { "NHSpecificTest.Futures.Mappings.hbm.xml" }; }
+			get { return new[] { "Futures.Mappings.hbm.xml" }; }
 		}
 
 		protected override string MappingsAssembly
diff --git a/src/NHibernate.Test/Futures/FutureQueryFixture.cs b/src/NHibernate.Test/Futures/FutureQueryFixture.cs
@@ -1,12 +1,9 @@
 ﻿using System.Linq;
 using NHibernate.Driver;
-using NHibernate.Impl;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
-	using System.Collections;
-
 	[TestFixture]
 	public class FutureQueryFixture : FutureFixture
 	{
diff --git a/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs b/src/NHibernate.Test/Futures/FutureQueryOverFixture.cs
@@ -1,9 +1,7 @@
 using System.Linq;
-using NHibernate.Criterion;
-using NHibernate.Impl;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	[TestFixture]
 	public class FutureQueryOverFixture : FutureFixture
diff --git a/src/NHibernate.Test/Futures/LinqFutureFixture.cs b/src/NHibernate.Test/Futures/LinqFutureFixture.cs
@@ -3,7 +3,7 @@
 using NUnit.Framework;
 using System.Linq;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	[TestFixture]
 	public class LinqFutureFixture : FutureFixture
diff --git a/src/NHibernate.Test/Futures/LinqToFutureValueFixture.cs b/src/NHibernate.Test/Futures/LinqToFutureValueFixture.cs
@@ -2,7 +2,7 @@
 using NHibernate.Linq;
 using NUnit.Framework;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public class LinqToFutureValueFixture : FutureFixture
 	{
diff --git a/src/NHibernate.Test/Futures/Mappings.hbm.xml b/src/NHibernate.Test/Futures/Mappings.hbm.xml
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8" ?>
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"
-				   namespace="NHibernate.Test.NHSpecificTest.Futures"
+				   namespace="NHibernate.Test.Futures"
 				   assembly="NHibernate.Test">
 
 	<class name="Person">
diff --git a/src/NHibernate.Test/Futures/Person.cs b/src/NHibernate.Test/Futures/Person.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NHibernate.Test.NHSpecificTest.Futures
+namespace NHibernate.Test.Futures
 {
 	public class Person
 	{
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -393,6 +393,14 @@
     <Compile Include="FilterTest\Product.cs" />
     <Compile Include="FilterTest\Salesperson.cs" />
     <Compile Include="FilterTest\TestClass.cs" />
+    <Compile Include="Futures\FallbackFixture.cs" />
+    <Compile Include="Futures\FutureCriteriaFixture.cs" />
+    <Compile Include="Futures\FutureFixture.cs" />
+    <Compile Include="Futures\FutureQueryFixture.cs" />
+    <Compile Include="Futures\FutureQueryOverFixture.cs" />
+    <Compile Include="Futures\LinqFutureFixture.cs" />
+    <Compile Include="Futures\LinqToFutureValueFixture.cs" />
+    <Compile Include="Futures\Person.cs" />
     <Compile Include="Generatedkeys\ByTrigger\GeneratedIdentityFixture.cs" />
     <Compile Include="Generatedkeys\ByTrigger\MyEntity.cs" />
     <Compile Include="Generatedkeys\Identity\IdentityGeneratedKeysTest.cs" />
@@ -1000,7 +1008,6 @@
     <Compile Include="NHSpecificTest\NH646\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3234\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3234\Domain.cs" />
-    <Compile Include="NHSpecificTest\Futures\LinqToFutureValueFixture.cs" />
     <Compile Include="NHSpecificTest\NH2955\Employee.cs" />
     <Compile Include="NHSpecificTest\NH2955\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH3175\Fixture.cs" />
@@ -1071,7 +1078,6 @@
     <Compile Include="NHSpecificTest\EntityNameAndCompositeId\Fixture.cs" />
     <Compile Include="NHSpecificTest\EntityNameAndInheritance\Fixture.cs" />
     <Compile Include="NHSpecificTest\EntityNameWithFullName\Fixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\LinqFutureFixture.cs" />
     <Compile Include="NHSpecificTest\NH0000\Entity.cs" />
     <Compile Include="NHSpecificTest\NH0000\Fixture.cs" />
     <Compile Include="NHSpecificTest\NH0000\FixtureByCode.cs" />
@@ -1528,7 +1534,6 @@
     <Compile Include="NHSpecificTest\ElementsEnums\IntEnumsBagPartialNameFixture.cs" />
     <Compile Include="NHSpecificTest\ElementsEnums\IntEnumsBagFixture.cs" />
     <Compile Include="NHSpecificTest\ElementsEnums\Something.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureQueryOverFixture.cs" />
     <Compile Include="NHSpecificTest\ManyToOneFilters20Behaviour\Fixture.cs" />
     <Compile Include="NHSpecificTest\ManyToOneFilters20Behaviour\Model.cs" />
     <Compile Include="NHSpecificTest\NH1255\Domain.cs" />
@@ -1594,8 +1599,6 @@
     <Compile Include="NHSpecificTest\Dates\TimeFixture.cs" />
     <Compile Include="NHSpecificTest\DtcFailures\DtcFailuresFixture.cs" />
     <Compile Include="NHSpecificTest\DtcFailures\Person.cs" />
-    <Compile Include="NHSpecificTest\Futures\FallbackFixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureFixture.cs" />
     <Compile Include="NHSpecificTest\Logs\LogsFixture.cs" />
     <Compile Include="NHSpecificTest\Logs\Person.cs" />
     <Compile Include="NHSpecificTest\NH1391\Animal.cs" />
@@ -1937,9 +1940,6 @@
     <Compile Include="NHSpecificTest\FileStreamSql2008\VendorCatalog.cs" />
     <Compile Include="NHSpecificTest\FileStreamSql2008\Fixture.cs" />
     <Compile Include="NHSpecificTest\FileStreamSql2008\Convert.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureQueryFixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\FutureCriteriaFixture.cs" />
-    <Compile Include="NHSpecificTest\Futures\Person.cs" />
     <Compile Include="NHSpecificTest\Dates\AllDates.cs" />
     <Compile Include="NHSpecificTest\Dates\DateTimeOffsetFixture.cs" />
     <Compile Include="NHSpecificTest\NH1274ExportExclude\Home.cs" />
@@ -3280,6 +3280,7 @@
     <EmbeddedResource Include="NHSpecificTest\NH1291AnonExample\Mappings.hbm.xml" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Futures\Mappings.hbm.xml" />
     <EmbeddedResource Include="SessionBuilder\Mappings.hbm.xml" />
     <EmbeddedResource Include="IdTest\IdentityClass.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1904\StructMappings.hbm.xml" />
@@ -3785,7 +3786,6 @@
     <EmbeddedResource Include="NHSpecificTest\NH1654\Mappings.hbm.xml" />
     <EmbeddedResource Include="Pagination\DataPoint.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\Dates\Mappings\DateTime2.hbm.xml" />
-    <EmbeddedResource Include="NHSpecificTest\Futures\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1643\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1640\Mappings.hbm.xml" />
     <EmbeddedResource Include="NHSpecificTest\NH1584\Mappings.hbm.xml" />

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,14 @@`
`1`	`1`	`using System.Collections;`
`2`		`-using NHibernate.Driver;`
`3`		`-using NHibernate.Impl;`
`4`	`2`
`5`	`3`	`using NUnit.Framework;`
`6`	`4`
`7`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`5`	`+namespace NHibernate.Test.Futures`
`8`	`6`	`{`
`9`	`7`	`public abstract class FutureFixture : TestCase`
`10`	`8`	`{`
`11`	`9`	`protected override IList Mappings`
`12`	`10`	`{`
`13`		`- get { return new[] { "NHSpecificTest.Futures.Mappings.hbm.xml" }; }`
	`11`	`+ get { return new[] { "Futures.Mappings.hbm.xml" }; }`
`14`	`12`	`}`
`15`	`13`
`16`	`14`	`protected override string MappingsAssembly`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,9 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`	`using NHibernate.Driver;`
`3`		`-using NHibernate.Impl;`
`4`	`3`	`using NUnit.Framework;`
`5`	`4`
`6`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`5`	`+namespace NHibernate.Test.Futures`
`7`	`6`	`{`
`8`		`- using System.Collections;`
`9`		`-`
`10`	`7`	`[TestFixture]`
`11`	`8`	`public class FutureQueryFixture : FutureFixture`
`12`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using System.Linq;`
`5`	`5`
`6`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`6`	`+namespace NHibernate.Test.Futures`
`7`	`7`	`{`
`8`	`8`	`[TestFixture]`
`9`	`9`	`public class LinqFutureFixture : FutureFixture`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using NHibernate.Linq;`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`
`5`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`5`	`+namespace NHibernate.Test.Futures`
`6`	`6`	`{`
`7`	`7`	`public class LinqToFutureValueFixture : FutureFixture`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`
`3`		`-namespace NHibernate.Test.NHSpecificTest.Futures`
	`3`	`+namespace NHibernate.Test.Futures`
`4`	`4`	`{`
`5`	`5`	`public class Person`
`6`	`6`	`{`