From 8d2f544d3fb96c747915b8f7ba7c3268fee8bcf2 Mon Sep 17 00:00:00 2001
From: Nathan Brown <nathan@nkbrown.us>
Date: Thu, 13 Aug 2020 01:51:06 -0700
Subject: [PATCH] Improve CriteriaAssertFixture

---
 .../Criteria/Lambda/CriteriaAssertFixture.cs  | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs b/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs
index c93a92bf1dd..63bbf4a06e2 100644
--- a/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs
+++ b/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs
@@ -12,28 +12,16 @@ public class CriteriaAssertFixture : LambdaFixtureBase
 	{
 		private void AssertCriteriaAreNotEqual(ICriteria expected, ICriteria actual)
 		{
-			try
-			{
-				AssertCriteriaAreEqual(expected, actual);
-				Assert.Fail("No exception thrown");
-			}
-			catch
-			{
-				Assert.Pass();
-			}
+			Assert.Throws<AssertionException>(
+				() => { AssertCriteriaAreEqual(expected, actual); },
+				"No exception thrown");
 		}
 
 		private void AssertCriteriaAreNotEqual(DetachedCriteria expected, DetachedCriteria actual)
 		{
-			try
-			{
-				AssertCriteriaAreEqual(expected, actual);
-				Assert.Fail("No exception thrown");
-			}
-			catch
-			{
-				Assert.Pass();
-			}
+			Assert.Throws<AssertionException>(
+				() => { AssertCriteriaAreEqual(expected, actual); },
+				"No exception thrown");
 		}
 
 		[Test]