NH-3900 - Update to NUnit 3.6.0

hazzik · hazzik · commit 468188f49363 · 2017-02-11T22:23:29.000+13:00
* TestFixtureSetUp becomes OneTimeSetUp
* TestFixtureTearDown becomes OneTimeTearDown
* Use OneTimeSetUp &amp; OneTimeTearDown for LinqReadonlyTestsContext
* Mark assemblies with [assembly: LevelOfParallelism(0)] attribute to preserve old LinqReadonlyTestsContext behavior
diff --git a/src/NHibernate.Test.VisualBasic/AssemblyInfo.vb b/src/NHibernate.Test.VisualBasic/AssemblyInfo.vb
@@ -0,0 +1,3 @@
+﻿Imports NUnit.Framework
+
+<assembly: LevelOfParallelism(0)>
diff --git a/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj b/src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj
@@ -52,8 +52,8 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -77,6 +77,7 @@
     <Compile Include="..\SharedAssemblyInfo.vb">
       <Link>SharedAssemblyInfo.vb</Link>
     </Compile>
+    <Compile Include="AssemblyInfo.vb" />
     <Compile Include="Issues\NH2966\Client.vb" />
     <Compile Include="Issues\NH2966\Fixture.vb" />
     <Compile Include="Issues\NH3302\Entity.vb" />
diff --git a/src/NHibernate.Test.VisualBasic/packages.config b/src/NHibernate.Test.VisualBasic/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net461" />
+  <package id="NUnit" version="3.6.0" targetFramework="net461" />
 </packages>
diff --git a/src/NHibernate.Test/AssemblyInfo.cs b/src/NHibernate.Test/AssemblyInfo.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Reflection;
+using NUnit.Framework;
 
 [assembly: CLSCompliantAttribute(false)]
 [assembly: AssemblyTitleAttribute("NHibernate.Test")]
@@ -9,3 +10,4 @@
 [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
 [assembly: AssemblyDelaySignAttribute(false)]
 
+[assembly: LevelOfParallelism(0)]
diff --git a/src/NHibernate.Test/CfgTest/DefaultNsAssmFixture.cs b/src/NHibernate.Test/CfgTest/DefaultNsAssmFixture.cs
@@ -94,7 +94,7 @@ public class DefaultNsAssmFixture
 
 		#region NUnit.Framework.TestFixture Members
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			dir_ = TestContext.CurrentContext.TestDirectory;
@@ -138,7 +138,7 @@ public virtual void TearDown()
 		{
 		}
 
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public virtual void TestFixtureTearDown()
 		{
 		}
@@ -217,4 +217,4 @@ public void MixedSubclass()
 			// if no exception, success
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs b/src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs
@@ -132,7 +132,7 @@ public class HbmOrderingFixture
 
 		#region NUnit.Framework.TestFixture Members
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			dir_ = TestContext.CurrentContext.TestDirectory;
@@ -176,7 +176,7 @@ public virtual void TearDown()
 		{
 		}
 
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public virtual void TestFixtureTearDown()
 		{
 		}
@@ -255,4 +255,4 @@ public void MixedSubclass()
 			// if no exception, success
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs b/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs
@@ -18,25 +18,25 @@ private void AssertCriteriaAreNotEqual(ICriteria expected, ICriteria actual)
 			try
 			{
 				AssertCriteriaAreEqual(expected, actual);
+				Assert.Fail("No exception thrown");
 			}
 			catch
 			{
-				return;
+				Assert.Pass();
 			}
-			Assert.Fail("No exception thrown");
 		}
 
 		private void AssertCriteriaAreNotEqual(DetachedCriteria expected, DetachedCriteria actual)
 		{
 			try
 			{
 				AssertCriteriaAreEqual(expected, actual);
+				Assert.Fail("No exception thrown");
 			}
 			catch
 			{
-				return;
+				Assert.Pass();
 			}
-			Assert.Fail("No exception thrown");
 		}
 
 		[Test]
diff --git a/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs b/src/NHibernate.Test/IdGen/NativeGuid/NativeGuidGeneratorFixture.cs
@@ -12,7 +12,7 @@ public class NativeGuidGeneratorFixture
 		protected Configuration cfg;
 		protected ISessionFactoryImplementor sessions;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			cfg = new Configuration();
@@ -43,4 +43,4 @@ public void ReturnedValueIsGuid()
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs b/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs
@@ -48,7 +48,7 @@ private IEnumerable<string> Mappings
 			}
 		}
 
-		[SetUp]
+		[OneTimeSetUp]
 		public void CreateNorthwindDb()
 		{
 			Configuration configuration = Configure();
@@ -85,7 +85,7 @@ private void ExecuteScriptFile(Configuration configuration, string scripFileName
 			}
 		}
 
-		[TearDown]
+		[OneTimeTearDown]
 		public void DestroyNorthwindDb()
 		{
 			Configuration configuration = Configure();
diff --git a/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs b/src/NHibernate.Test/MappingTest/NonReflectiveBinderFixture.cs
@@ -16,15 +16,15 @@ public class NonReflectiveBinderFixture
 
 		private Configuration cfg;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void SetUp()
 		{
 			cfg = new Configuration()
 					.AddResource("NHibernate.Test.MappingTest.Wicked.hbm.xml", GetType().Assembly);
 			cfg.BuildMappings();
 		}
 
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TearDown()
 		{
 			cfg = null;
@@ -195,4 +195,4 @@ public void XmlSerialization()
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1710/Fixture.cs
@@ -18,7 +18,7 @@ public abstract class BaseFixture
 		protected ISessionFactoryImplementor factory;
 		private string expectedExportString;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void Config()
 		{
 			cfg = new Configuration();
@@ -89,4 +89,4 @@ protected override string GetResourceName()
 			return "WithColumnNode.hbm.xml";
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH480/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH480/Fixture.cs
@@ -25,7 +25,7 @@ public class Fixture
 		private CultureInfo currentCulture = null;
 		private CultureInfo currentUICulture = null;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			currentCulture = Thread.CurrentThread.CurrentCulture;
@@ -36,7 +36,7 @@ public void TestFixtureSetUp()
 			Thread.CurrentThread.CurrentUICulture = turkish;
 		}
 
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TestFixtureTearDown()
 		{
 			Thread.CurrentThread.CurrentCulture = currentCulture;
@@ -58,4 +58,4 @@ public void CheckIII()
 			Assert.AreEqual("iii_iii_iii", ImprovedNamingStrategy.Instance.ColumnName("IiiIiiIii"));
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj
@@ -79,8 +79,8 @@
       <HintPath>..\packages\log4net.2.0.7\lib\net45-full\log4net.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Remotion.Linq, Version=1.13.183.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL" Condition=" '$(Configuration)' == 'Debug' ">
diff --git a/src/NHibernate.Test/TestCase.cs b/src/NHibernate.Test/TestCase.cs
@@ -70,7 +70,7 @@ static TestCase()
 		/// <summary>
 		/// Creates the tables used in this TestCase
 		/// </summary>
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
 			try
@@ -113,7 +113,7 @@ public void TestFixtureSetUp()
 		/// will occur if the TestCase does not have the same hbm.xml files
 		/// included as a previous one.
 		/// </remarks>
-		[TestFixtureTearDown]
+		[OneTimeTearDown]
 		public void TestFixtureTearDown()
 		{
 			// If TestFixtureSetup fails due to an IgnoreException, it will still run the teardown.
diff --git a/src/NHibernate.Test/TypesTest/TypeSqlTypeFixture.cs b/src/NHibernate.Test/TypesTest/TypeSqlTypeFixture.cs
@@ -25,7 +25,7 @@ public abstract class TypeSqlTypeFixture
 		protected Configuration cfg;
 		protected ISessionFactoryImplementor factory;
 
-		[TestFixtureSetUp]
+		[OneTimeSetUp]
 		public void Config()
 		{
 			cfg = new Configuration();
@@ -141,4 +141,4 @@ protected override string GetResourceName()
 			return "MultiTypeEntity_WithSqlType.hbm.xml";
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/packages.config b/src/NHibernate.Test/packages.config
@@ -3,7 +3,7 @@
   <package id="Antlr" version="3.5.0.2" targetFramework="net461" />
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net461" />
   <package id="log4net" version="2.0.7" targetFramework="net461" />
-  <package id="NUnit" version="2.6.4" targetFramework="net461" />
+  <package id="NUnit" version="3.6.0" targetFramework="net461" />
   <package id="Remotion.Linq" version="1.13.183.0" targetFramework="net461" />
   <package id="System.Linq.Dynamic" version="1.0.7" targetFramework="net461" />
 </packages>
diff --git a/src/NHibernate.TestDatabaseSetup/AssemblyInfo.cs b/src/NHibernate.TestDatabaseSetup/AssemblyInfo.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Configuration;
 using System.Reflection;
+using NUnit.Framework;
 
 [assembly: CLSCompliantAttribute(true)]
 [assembly: AssemblyTitleAttribute("NHibernate.TestDatabaseSetup")]
@@ -10,3 +11,4 @@
 [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
 [assembly: AssemblyDelaySignAttribute(false)]
 
+[assembly: LevelOfParallelism(0)]
diff --git a/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj b/src/NHibernate.TestDatabaseSetup/NHibernate.TestDatabaseSetup.csproj
@@ -66,8 +66,8 @@
     <Reference Include="Npgsql">
       <HintPath>..\..\lib\teamcity\postgresql\Npgsql.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/NHibernate.TestDatabaseSetup/packages.config b/src/NHibernate.TestDatabaseSetup/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.4" targetFramework="net461" />
+  <package id="NUnit" version="3.6.0" targetFramework="net461" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Imports NUnit.Framework`
	`2`	`+`
	`3`	`+<assembly: LevelOfParallelism(0)>`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public class DefaultNsAssmFixture`
`94`	`94`
`95`	`95`	`#region NUnit.Framework.TestFixture Members`
`96`	`96`
`97`		`- [TestFixtureSetUp]`
	`97`	`+ [OneTimeSetUp]`
`98`	`98`	`public void TestFixtureSetUp()`
`99`	`99`	`{`
`100`	`100`	`dir_ = TestContext.CurrentContext.TestDirectory;`
`@@ -138,7 +138,7 @@ public virtual void TearDown()`
`138`	`138`	`{`
`139`	`139`	`}`
`140`	`140`
`141`		`- [TestFixtureTearDown]`
	`141`	`+ [OneTimeTearDown]`
`142`	`142`	`public virtual void TestFixtureTearDown()`
`143`	`143`	`{`
`144`	`144`	`}`
`@@ -217,4 +217,4 @@ public void MixedSubclass()`
`217`	`217`	`// if no exception, success`
`218`	`218`	`}`
`219`	`219`	`}`
`220`		`-}`
	`220`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public class HbmOrderingFixture`
`132`	`132`
`133`	`133`	`#region NUnit.Framework.TestFixture Members`
`134`	`134`
`135`		`- [TestFixtureSetUp]`
	`135`	`+ [OneTimeSetUp]`
`136`	`136`	`public void TestFixtureSetUp()`
`137`	`137`	`{`
`138`	`138`	`dir_ = TestContext.CurrentContext.TestDirectory;`
`@@ -176,7 +176,7 @@ public virtual void TearDown()`
`176`	`176`	`{`
`177`	`177`	`}`
`178`	`178`
`179`		`- [TestFixtureTearDown]`
	`179`	`+ [OneTimeTearDown]`
`180`	`180`	`public virtual void TestFixtureTearDown()`
`181`	`181`	`{`
`182`	`182`	`}`
`@@ -255,4 +255,4 @@ public void MixedSubclass()`
`255`	`255`	`// if no exception, success`
`256`	`256`	`}`
`257`	`257`	`}`
`258`		`-}`
	`258`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,25 +18,25 @@ private void AssertCriteriaAreNotEqual(ICriteria expected, ICriteria actual)`
`18`	`18`	`try`
`19`	`19`	`{`
`20`	`20`	`AssertCriteriaAreEqual(expected, actual);`
	`21`	`+ Assert.Fail("No exception thrown");`
`21`	`22`	`}`
`22`	`23`	`catch`
`23`	`24`	`{`
`24`		`- return;`
	`25`	`+ Assert.Pass();`
`25`	`26`	`}`
`26`		`- Assert.Fail("No exception thrown");`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`private void AssertCriteriaAreNotEqual(DetachedCriteria expected, DetachedCriteria actual)`
`30`	`30`	`{`
`31`	`31`	`try`
`32`	`32`	`{`
`33`	`33`	`AssertCriteriaAreEqual(expected, actual);`
	`34`	`+ Assert.Fail("No exception thrown");`
`34`	`35`	`}`
`35`	`36`	`catch`
`36`	`37`	`{`
`37`		`- return;`
	`38`	`+ Assert.Pass();`
`38`	`39`	`}`
`39`		`- Assert.Fail("No exception thrown");`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class NativeGuidGeneratorFixture`
`12`	`12`	`protected Configuration cfg;`
`13`	`13`	`protected ISessionFactoryImplementor sessions;`
`14`	`14`
`15`		`- [TestFixtureSetUp]`
	`15`	`+ [OneTimeSetUp]`
`16`	`16`	`public void TestFixtureSetUp()`
`17`	`17`	`{`
`18`	`18`	`cfg = new Configuration();`
`@@ -43,4 +43,4 @@ public void ReturnedValueIsGuid()`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ private IEnumerable<string> Mappings`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`- [SetUp]`
	`51`	`+ [OneTimeSetUp]`
`52`	`52`	`public void CreateNorthwindDb()`
`53`	`53`	`{`
`54`	`54`	`Configuration configuration = Configure();`
`@@ -85,7 +85,7 @@ private void ExecuteScriptFile(Configuration configuration, string scripFileName`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- [TearDown]`
	`88`	`+ [OneTimeTearDown]`
`89`	`89`	`public void DestroyNorthwindDb()`
`90`	`90`	`{`
`91`	`91`	`Configuration configuration = Configure();`
Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@ public class NonReflectiveBinderFixture`
`16`	`16`
`17`	`17`	`private Configuration cfg;`
`18`	`18`
`19`		`- [TestFixtureSetUp]`
	`19`	`+ [OneTimeSetUp]`
`20`	`20`	`public void SetUp()`
`21`	`21`	`{`
`22`	`22`	`cfg = new Configuration()`
`23`	`23`	`.AddResource("NHibernate.Test.MappingTest.Wicked.hbm.xml", GetType().Assembly);`
`24`	`24`	`cfg.BuildMappings();`
`25`	`25`	`}`
`26`	`26`
`27`		`- [TestFixtureTearDown]`
	`27`	`+ [OneTimeTearDown]`
`28`	`28`	`public void TearDown()`
`29`	`29`	`{`
`30`	`30`	`cfg = null;`
`@@ -195,4 +195,4 @@ public void XmlSerialization()`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`	`}`
`198`		`-}`
	`198`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public abstract class BaseFixture`
`18`	`18`	`protected ISessionFactoryImplementor factory;`
`19`	`19`	`private string expectedExportString;`
`20`	`20`
`21`		`- [TestFixtureSetUp]`
	`21`	`+ [OneTimeSetUp]`
`22`	`22`	`public void Config()`
`23`	`23`	`{`
`24`	`24`	`cfg = new Configuration();`
`@@ -89,4 +89,4 @@ protected override string GetResourceName()`
`89`	`89`	`return "WithColumnNode.hbm.xml";`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`-}`
	`92`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class Fixture`
`25`	`25`	`private CultureInfo currentCulture = null;`
`26`	`26`	`private CultureInfo currentUICulture = null;`
`27`	`27`
`28`		`- [TestFixtureSetUp]`
	`28`	`+ [OneTimeSetUp]`
`29`	`29`	`public void TestFixtureSetUp()`
`30`	`30`	`{`
`31`	`31`	`currentCulture = Thread.CurrentThread.CurrentCulture;`
`@@ -36,7 +36,7 @@ public void TestFixtureSetUp()`
`36`	`36`	`Thread.CurrentThread.CurrentUICulture = turkish;`
`37`	`37`	`}`
`38`	`38`
`39`		`- [TestFixtureTearDown]`
	`39`	`+ [OneTimeTearDown]`
`40`	`40`	`public void TestFixtureTearDown()`
`41`	`41`	`{`
`42`	`42`	`Thread.CurrentThread.CurrentCulture = currentCulture;`
`@@ -58,4 +58,4 @@ public void CheckIII()`
`58`	`58`	`Assert.AreEqual("iii_iii_iii", ImprovedNamingStrategy.Instance.ColumnName("IiiIiiIii"));`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`-}`
	`61`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public abstract class TypeSqlTypeFixture`
`25`	`25`	`protected Configuration cfg;`
`26`	`26`	`protected ISessionFactoryImplementor factory;`
`27`	`27`
`28`		`- [TestFixtureSetUp]`
	`28`	`+ [OneTimeSetUp]`
`29`	`29`	`public void Config()`
`30`	`30`	`{`
`31`	`31`	`cfg = new Configuration();`
`@@ -141,4 +141,4 @@ protected override string GetResourceName()`
`141`	`141`	`return "MultiTypeEntity_WithSqlType.hbm.xml";`
`142`	`142`	`}`
`143`	`143`	`}`
`144`		`-}`
	`144`	`+}`