Fix conflicts with new assertion overloads

Author: paulirwin

src/Lucene.Net.TestFramework/Support/TestFramework/Assert.cs

@@ -910,16 +910,18 @@ public static void DoesNotThrow(Action action)
 
         [DebuggerStepThrough]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Exception Throws<TException>(Action action, string message, params object[] args)
+        public static TException Throws<TException>(Action action, string message, params object[] args)
+            where TException : Exception
         {
-            return Throws(typeof(TException), action, message, args);
+            return NUnit.Framework.Assert.Throws<TException>(action, message, args)!;
         }
 
         [DebuggerStepThrough]
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Exception Throws<TException>(Action action)
+        public static TException Throws<TException>(Action action)
+            where TException : Exception
         {
-            return Throws(typeof(TException), action);
+            return NUnit.Framework.Assert.Throws<TException>(action)!;
         }
 
         [DebuggerStepThrough]
@@ -953,6 +955,20 @@ public static T Throws<T>(string expectedParamName, Action action)
             return exception;
         }
 
+        [DebuggerStepThrough]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Exception Catch(Action action)
+        {
+            return NUnit.Framework.Assert.Catch(action);
+        }
+
+        [DebuggerStepThrough]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Exception Catch(Action action, string message, params object[] args)
+        {
+            return NUnit.Framework.Assert.Catch(action, message, args);
+        }
+
         [DebuggerStepThrough]
         public static Exception ThrowsFileAlreadyExistsException(string filePath, Action action)
         {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs

@@ -7,6 +7,7 @@
 using System.Globalization;
 using System.IO;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs

@@ -5,6 +5,7 @@
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs

@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs

@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs

@@ -4,6 +4,7 @@
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs

@@ -8,6 +8,7 @@
 using NUnit.Framework;
 using System.Collections.Generic;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs

@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs

@@ -2,6 +2,7 @@
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Sinks
 {

src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs

@@ -12,6 +12,7 @@
 using System.Linq;
 using System.Text;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Analysis.Util
 {