NH-3900 - Replace ExpectedExceptionAttribute with Assert delegate.

Author: ngbrown

src/NHibernate.Test.Linq/Linq/ByMethod/DistinctTests.cs

@@ -98,36 +98,46 @@ public void DistinctOnTypeProjectionWithHqlMethodIsOk()
 		}
 
 		[Test]
-		[ExpectedException(typeof(NotSupportedException), ExpectedMessage = "Cannot use distinct on result that depends on methods for which no SQL equivalent exist.")]
 		public void DistinctOnTypeProjectionWithCustomProjectionMethodsIsBlocked1()
 		{
 			// Sort of related to NH-2645.
 
-			OrderDto[] result = db.Orders
-				.Select(x => new OrderDto
-								 {
-									 ShippingDate = Transform(x.ShippingDate),
-									 OrderDate = Transform(x.OrderDate)
-								 })
-				.Distinct()
-				.ToArray();
+			Assert.That(
+				() =>
+				{
+					OrderDto[] result = db.Orders
+						.Select(x => new OrderDto
+										 {
+											 ShippingDate = Transform(x.ShippingDate),
+											 OrderDate = Transform(x.OrderDate)
+										 })
+						.Distinct()
+						.ToArray();
+				},
+				Throws.TypeOf<NotSupportedException>()
+				      .And.Message.EqualTo("Cannot use distinct on result that depends on methods for which no SQL equivalent exist."));
 		}
 
 
 		[Test]
-		[ExpectedException(typeof(NotSupportedException), ExpectedMessage = "Cannot use distinct on result that depends on methods for which no SQL equivalent exist.")]
 		public void DistinctOnTypeProjectionWithCustomProjectionMethodsIsBlocked2()
 		{
 			// Sort of related to NH-2645.
 
-			OrderDto[] result = db.Orders
-				.Select(x => new OrderDto
+			Assert.That(
+				() =>
 				{
-					ShippingDate = x.ShippingDate,
-					OrderDate = x.OrderDate.Value.AddMonths(5),  // As of 2012-01-25, AddMonths() is executed locally.
-				})
-				.Distinct()
-				.ToArray();
+					OrderDto[] result = db.Orders
+						.Select(x => new OrderDto
+						{
+							ShippingDate = x.ShippingDate,
+							OrderDate = x.OrderDate.Value.AddMonths(5),  // As of 2012-01-25, AddMonths() is executed locally.
+						})
+						.Distinct()
+						.ToArray();
+				},
+				Throws.TypeOf<NotSupportedException>()
+				      .And.Message.EqualTo("Cannot use distinct on result that depends on methods for which no SQL equivalent exist."));
 		}
 	}
 }

src/NHibernate.Test.Linq/Linq/ByMethod/SumTests.cs

@@ -7,10 +7,13 @@ namespace NHibernate.Test.Linq.ByMethod
 	public class SumTests : LinqTestCase
 	{
 		[Test]
-		[ExpectedException]
 		public void EmptySumDecimal()
 		{
-			db.OrderLines.Where(ol => false).Sum(ol => ol.Discount);
+			Assert.That(
+				() =>
+				{
+					db.OrderLines.Where(ol => false).Sum(ol => ol.Discount);
+				}, Throws.InstanceOf<HibernateException>());
 		}
 
 		[Test]
@@ -48,4 +51,4 @@ public void SumSingle()
 			Assert.Greater(total, 0);
 		}
 	}
-}
+}

src/NHibernate.Test/KnownBugAttribute.cs

@@ -1,24 +1,28 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 
 namespace NHibernate.Test
 {
-	public class KnownBugAttribute : ExpectedExceptionAttribute
+	public class KnownBugAttribute : IgnoreAttribute
 	{
+		public string UserMessage { get; set; }
+
 		public KnownBugAttribute(string bug)
+			: base("Known bug " + bug)
 		{
 			UserMessage = "Known bug " + bug;
 		}
 
-		public KnownBugAttribute(string bug, System.Type exceptionType) 
-			: base(exceptionType)
+		public KnownBugAttribute(string bug, System.Type exceptionType)
+			: base("Known bug " + bug)
 		{
 			UserMessage = "Known bug " + bug;
 		}
 
 		public KnownBugAttribute(string bug, string exceptionName)
-			: base(exceptionName)
+			: base("Known bug " + bug)
 		{
 			UserMessage = "Known bug " + bug;
 		}
 	}
-}
+}

src/NHibernate.Test/NHSpecificTest/NH2065/Fixture.cs

@@ -40,9 +40,6 @@ protected override void OnTearDown()
         }
 
 		[Test]
-        [ExpectedException(
-            ExpectedException=typeof(HibernateException), 
-            ExpectedMessage="reassociated object has dirty collection: NHibernate.Test.NHSpecificTest.NH2065.Person.Children")]
 		public void GetGoodErrorForDirtyReassociatedCollection()
 		{
             Person person;
@@ -59,7 +56,11 @@ public void GetGoodErrorForDirtyReassociatedCollection()
             using (var s = OpenSession())
             using (s.BeginTransaction())
             {
-                s.Lock(person, LockMode.None);
+				Assert.That(
+					() =>
+					{
+						s.Lock(person, LockMode.None);
+					}, Throws.TypeOf<HibernateException>().And.Message.EqualTo("reassociated object has dirty collection: NHibernate.Test.NHSpecificTest.NH2065.Person.Children"));
             }
 		} 
 

src/NHibernate.Test/NHSpecificTest/NH2297/Fixture.cs

@@ -9,17 +9,9 @@ namespace NHibernate.Test.NHSpecificTest.NH2297
 	[TestFixture]
 	public class Fixture // Purposefully doesn't inherit from BugTestCase
 	{
-		[TestCase(".MappingsNames.hbm.xml",
-			ExpectedException = typeof (InvalidOperationException),
-			ExpectedMessage =
-				"ICompositeUserType NHibernate.Test.NHSpecificTest.NH2297.InvalidNamesCustomCompositeUserType returned a null value for 'PropertyNames'."
-			)]
-		[TestCase(".MappingsTypes.hbm.xml",
-			ExpectedException = typeof (InvalidOperationException),
-			ExpectedMessage =
-				"ICompositeUserType NHibernate.Test.NHSpecificTest.NH2297.InvalidTypesCustomCompositeUserType returned a null value for 'PropertyTypes'."
-			)]
-		public void InvalidCustomCompositeUserTypeThrowsMeaningfulException(string mappingFile)
+		[TestCase(".MappingsNames.hbm.xml", "ICompositeUserType NHibernate.Test.NHSpecificTest.NH2297.InvalidNamesCustomCompositeUserType returned a null value for 'PropertyNames'.")]
+		[TestCase(".MappingsTypes.hbm.xml", "ICompositeUserType NHibernate.Test.NHSpecificTest.NH2297.InvalidTypesCustomCompositeUserType returned a null value for 'PropertyTypes'.")]
+		public void InvalidCustomCompositeUserTypeThrowsMeaningfulException(string mappingFile, string expectedExceptionMessage)
 		{
 			var cfg = new Configuration();
 
@@ -36,7 +28,12 @@ public void InvalidCustomCompositeUserTypeThrowsMeaningfulException(string mappi
 			cfg.AddResource(MappingsAssembly + "." + "NHSpecificTest." + bugNumber + mappingFile, assembly);
 
 			// build session factory creates the invalid custom type mapper, and throws the exception
-			cfg.BuildSessionFactory();
+			Assert.That(
+				() =>
+				{
+					cfg.BuildSessionFactory();
+				},
+				Throws.InvalidOperationException.And.Message.EqualTo(expectedExceptionMessage));
 		}
 	}
 }

src/NHibernate.Test/UtilityTest/TypeNameParserFixture.cs

@@ -59,10 +59,15 @@ public void ParseComplexGenericTypeName()
 			CheckInput(typeName, expectedTypeName, null);
 		}
 
-		[Test, Ignore("Not a big problem because the next type request will throw the exception"), ExpectedException(typeof(ParserException))]
+		[Test, Ignore("Not a big problem because the next type request will throw the exception")]
 		public void ParseUnmatchedBracket()
 		{
-		  TypeNameParser.Parse("SomeName[");
+			Assert.That(
+				() =>
+				{
+					TypeNameParser.Parse("SomeName[");
+				},
+				Throws.TypeOf<ParserException>());
 		}
 
 		[Test]
@@ -295,4 +300,4 @@ public void ComplexNestedWithGeneric()
 			CheckInput(typeof(Aa<int>.Bb<int, short, string>.C).FullName, typeof(Aa<int>.Bb<int, short, string>.C).FullName, null);
 		} 
 	}
-}
+}