NH-3900 - Prework for NUnit 3, but still on NUnit 2.x

src/NHibernate.Test/CfgTest/AccessorsSerializableTest.cs

@@ -9,26 +9,26 @@ public class AccessorsSerializableTest
 	{
 		private static System.Type[] accessors = typeof (IPropertyAccessor).Assembly.GetTypes().Where(t => t.Namespace == typeof (IPropertyAccessor).Namespace && t.GetInterfaces().Contains(typeof (IPropertyAccessor))).ToArray();
 
-		[Test, TestCaseSource("accessors")]
+		[Test, TestCaseSource(nameof(accessors))]
 		public void AllAccessorsAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
 			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 
 		private static System.Type[] setters = typeof(ISetter).Assembly.GetTypes().Where(t => t.Namespace == typeof(ISetter).Namespace && t.GetInterfaces().Contains(typeof(ISetter))).ToArray();
 
-		[Test, TestCaseSource("setters")]
+		[Test, TestCaseSource(nameof(setters))]
 		public void AllSettersAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
 			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 
 		private static System.Type[] getters = typeof(IGetter).Assembly.GetTypes().Where(t => t.Namespace == typeof(IGetter).Namespace && t.GetInterfaces().Contains(typeof(IGetter))).ToArray();
 
-		[Test, TestCaseSource("getters")]
+		[Test, TestCaseSource(nameof(getters))]
 		public void AllGettersAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
 			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 	}
-}
+}

src/NHibernate.Test/CfgTest/ConfigurationFixture.cs

@@ -27,7 +27,7 @@ public class ConfigurationFixture
 		public void ReadCfgXmlFromDefaultFile()
 		{
 			Configuration cfg = new Configuration();
-			cfg.Configure("TestEnbeddedConfig.cfg.xml");
+			cfg.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"));
 
 			Assert.IsTrue(cfg.Properties.ContainsKey(Environment.ShowSql));
 			Assert.IsTrue(cfg.Properties.ContainsKey(Environment.UseQueryCache));
@@ -91,16 +91,16 @@ public void ReadCfgXmlFromAssembly()
 		public void InvalidXmlInCfgFile()
 		{
 			XmlDocument cfgXml = new XmlDocument();
-			cfgXml.Load("TestEnbeddedConfig.cfg.xml");
+			cfgXml.Load(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"));
 
 			// this should put us at the first <property> element
 			XmlElement propElement = cfgXml.DocumentElement.GetElementsByTagName("property")[0] as XmlElement;
 
 			// removing this will cause it not to validate
 			propElement.RemoveAttribute("name");
 
-			const string FileNameForInvalidCfg = "hibernate.invalid.cfg.xml";
-      cfgXml.Save(FileNameForInvalidCfg);
+			string FileNameForInvalidCfg = Path.Combine(TestContext.CurrentContext.TestDirectory, "hibernate.invalid.cfg.xml");
+			cfgXml.Save(FileNameForInvalidCfg);
 
 			Configuration cfg = new Configuration();
 			try
@@ -222,7 +222,7 @@ public void CacheConfiguration()
 		[Test]
 		public void InvalidXmlInHbmFile()
 		{
-			string filename = "invalid.hbm.xml";
+			string filename = Path.Combine(TestContext.CurrentContext.TestDirectory, "invalid.hbm.xml");
 			// it's missing the class name - won't validate
 			string hbm =
 				@"<?xml version='1.0' encoding='utf-8' ?> 
@@ -432,7 +432,7 @@ public SampleQueryProvider(ISessionImplementor session) : base(session)
 		public void NH2890Standard()
 		{
 			var cfg = new Configuration();
-			cfg.Configure("TestEnbeddedConfig.cfg.xml")
+			cfg.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"))
 				.LinqQueryProvider<SampleQueryProvider>()
 				.SetDefaultAssembly("NHibernate.DomainModel")
 				.SetDefaultNamespace("NHibernate.DomainModel");
@@ -451,7 +451,7 @@ public void NH2890Standard()
 		public void NH2890Xml()
 		{
 			var cfg = new Configuration();
-			cfg.Configure("TestEnbeddedConfig.cfg.xml")
+			cfg.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"))
 				.SetDefaultAssembly("NHibernate.DomainModel")
 				.SetDefaultNamespace("NHibernate.DomainModel");
 

src/NHibernate.Test/CfgTest/DefaultNsAssmFixture.cs

@@ -97,33 +97,33 @@ public class DefaultNsAssmFixture
 		[TestFixtureSetUp]
 		public void TestFixtureSetUp()
 		{
-			dir_ = Directory.GetCurrentDirectory();
+			dir_ = TestContext.CurrentContext.TestDirectory;
 
 			// Create hbm files (ideally, we could just embed them directly into the
 			// assembly - same as VS does when 'Build Action' = 'Embedded Resource' - but
 			// I could not find a way to do this, so we use files instead)
 
-			StreamWriter aw = new StreamWriter("A1.hbm.xml");
+			StreamWriter aw = new StreamWriter(Path.Combine(dir_, "A1.hbm.xml"));
 			aw.Write(aJoinedHbmXml);
 			aw.Close();
 
-			StreamWriter bw = new StreamWriter("B1.hbm.xml");
+			StreamWriter bw = new StreamWriter(Path.Combine(dir_, "B1.hbm.xml"));
 			bw.Write(bJoinedHbmXml);
 			bw.Close();
 
-			StreamWriter cw = new StreamWriter("C1.hbm.xml");
+			StreamWriter cw = new StreamWriter(Path.Combine(dir_, "C1.hbm.xml"));
 			cw.Write(cJoinedHbmXml);
 			cw.Close();
 
-			StreamWriter asw = new StreamWriter("A1.subclass.hbm.xml");
+			StreamWriter asw = new StreamWriter(Path.Combine(dir_, "A1.subclass.hbm.xml"));
 			asw.Write(aJoinedHbmXml);
 			asw.Close();
 
-			StreamWriter bsw = new StreamWriter("B1.subclass.hbm.xml");
+			StreamWriter bsw = new StreamWriter(Path.Combine(dir_, "B1.subclass.hbm.xml"));
 			bsw.Write(bJoinedHbmXml);
 			bsw.Close();
 
-			StreamWriter csw = new StreamWriter("C1.subclass.hbm.xml");
+			StreamWriter csw = new StreamWriter(Path.Combine(dir_, "C1.subclass.hbm.xml"));
 			csw.Write(cJoinedHbmXml);
 			csw.Close();
 		}
@@ -151,15 +151,15 @@ public void TopDownJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestA1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -169,15 +169,15 @@ public void BottomUpJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestB1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -187,15 +187,15 @@ public void MixedJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestC1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -205,15 +205,15 @@ public void MixedSubclass()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestCSubclass1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("B.subclass.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.subclass.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.subclass.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 	}

src/NHibernate.Test/CfgTest/HbmOrderingFixture.cs

@@ -135,33 +135,33 @@ public class HbmOrderingFixture
 		[TestFixtureSetUp]
 		public void TestFixtureSetUp()
 		{
-			dir_ = Directory.GetCurrentDirectory();
+			dir_ = TestContext.CurrentContext.TestDirectory;
 
 			// Create hbm files (ideally, we could just embed them directly into the
 			// assembly - same as VS does when 'Build Action' = 'Embedded Resource' - but
 			// I could not find a way to do this, so we use files instead)
 
-			StreamWriter aw = new StreamWriter("A.hbm.xml");
+			StreamWriter aw = new StreamWriter(Path.Combine(dir_, "A.hbm.xml"));
 			aw.Write(aJoinedHbmXml);
 			aw.Close();
 
-			StreamWriter bw = new StreamWriter("B.hbm.xml");
+			StreamWriter bw = new StreamWriter(Path.Combine(dir_, "B.hbm.xml"));
 			bw.Write(bJoinedHbmXml);
 			bw.Close();
 
-			StreamWriter cw = new StreamWriter("C.hbm.xml");
+			StreamWriter cw = new StreamWriter(Path.Combine(dir_, "C.hbm.xml"));
 			cw.Write(cJoinedHbmXml);
 			cw.Close();
 
-			StreamWriter asw = new StreamWriter("A.subclass.hbm.xml");
+			StreamWriter asw = new StreamWriter(Path.Combine(dir_, "A.subclass.hbm.xml"));
 			asw.Write(aJoinedHbmXml);
 			asw.Close();
 
-			StreamWriter bsw = new StreamWriter("B.subclass.hbm.xml");
+			StreamWriter bsw = new StreamWriter(Path.Combine(dir_, "B.subclass.hbm.xml"));
 			bsw.Write(bJoinedHbmXml);
 			bsw.Close();
 
-			StreamWriter csw = new StreamWriter("C.subclass.hbm.xml");
+			StreamWriter csw = new StreamWriter(Path.Combine(dir_, "C.subclass.hbm.xml"));
 			csw.Write(cJoinedHbmXml);
 			csw.Close();
 		}
@@ -189,15 +189,15 @@ public void TopDownJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestA.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A.hbm.xml");
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -207,15 +207,15 @@ public void BottomUpJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestB.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C.hbm.xml");
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -225,15 +225,15 @@ public void MixedJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestC.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -243,15 +243,15 @@ public void MixedSubclass()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestCSubclass.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("B.subclass.hbm.xml", "B.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.subclass.hbm.xml", "A.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.subclass.hbm.xml", "C.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 	}

src/NHibernate.Test/CfgTest/Loquacious/ConfigurationFixture.cs

@@ -1,5 +1,6 @@
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
 using NHibernate.AdoNet;
 using NHibernate.Bytecode;
 using NHibernate.Cache;
@@ -130,7 +131,7 @@ public void UseConnectionStringName()
 		public void NH2890Loquacious()
 		{
 			var cfg = new Configuration();
-			cfg.Configure("TestEnbeddedConfig.cfg.xml")
+			cfg.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"))
 				.SetDefaultAssembly("NHibernate.DomainModel")
 				.SetDefaultNamespace("NHibernate.DomainModel")
 				.SessionFactory()
@@ -147,4 +148,4 @@ public void NH2890Loquacious()
 		}
 
 	}
-}
+}

src/NHibernate.Test/CfgTest/MappingDocumentAggregatorTests.cs

@@ -65,7 +65,7 @@ public void CompareDeserializationTimes()
 
 			for (int i = 0; i < 5; i++)
 			{
-				FileInfo tempFile = new FileInfo(Guid.NewGuid() + ".hbm.binary");
+				FileInfo tempFile = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, Guid.NewGuid() + ".hbm.binary"));
 
 				// Load the embedded xml mappings (and time it)
 				Stopwatch stopwatch1 = Stopwatch.StartNew();
@@ -105,4 +105,4 @@ public void CompareDeserializationTimes()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/DialectTest/FunctionTests/SequenceSupportFixture.cs

@@ -16,7 +16,7 @@ public class SequenceSupportFixture
 		/// <summary>
 		/// Test case data source for DialectSupportingSequencesMustFullfillSequenceContract().
 		/// </summary>
-		private IEnumerable<System.Type> GetAllDialectTypes()
+		private static IEnumerable<System.Type> GetAllDialectTypes()
 		{
 			var dialectBaseType = typeof(NHibernate.Dialect.Dialect);
 
@@ -26,7 +26,7 @@ public class SequenceSupportFixture
 		}
 
 
-		[TestCaseSource("GetAllDialectTypes")]
+		[TestCaseSource(nameof(GetAllDialectTypes))]
 		public void DialectSupportingSequencesMustFullfillSequenceContract(System.Type dialectType)
 		{
 			var dialect = (NHibernate.Dialect.Dialect)Activator.CreateInstance(dialectType);
@@ -51,4 +51,4 @@ public void DialectSupportingSequencesMustFullfillSequenceContract(System.Type d
 
 		}
 	}
-}
+}