SWEEP: Reviewed all catch blocks where Lucene uses AssertionError and…

… converted them to use our IsAssertionError() extension method (see apache#446).
NightOwl888 · Apr 14, 2021 · 7a9f7fc · 7a9f7fc
1 parent bd56fcb
commit 7a9f7fc
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 40 deletions.
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -559,7 +559,7 @@ internal static void CheckResetException(Analyzer a, string input)
             {
                 //ok
             }
-            catch (AssertionError expected) // LUCENENET: Actual AssertionError type is Lucene.Net.Diagnostics.AssertionException
+            catch (Exception expected) when (expected.IsAssertionError())
             {
                 // ok: MockTokenizer
                 Assert.IsTrue(expected.Message != null && expected.Message.Contains("wrong state"), expected.Message);
@@ -1145,8 +1145,7 @@ private static void CheckAnalysisConsistency(Random random, Analyzer a, bool use
                         {
                             ts.End();
                         }
-                        // LUCENENET: Actual AssertionError type is Lucene.Net.Diagnostics.AssertionException
-                        catch (AssertionError ae) when (ae.Message.Contains("End() called before IncrementToken() returned false!"))
+                        catch (Exception ae) when (ae.IsAssertionError() && ae.Message.Contains("End() called before IncrementToken() returned false!"))
                         {
                             // Catch & ignore MockTokenizer's
                             // anger...
@@ -1178,8 +1177,7 @@ private static void CheckAnalysisConsistency(Random random, Analyzer a, bool use
                         {
                             ts.End();
                         }
-                        // LUCENENET: Actual AssertionError type is Lucene.Net.Diagnostics.AssertionException
-                        catch (AssertionError ae) when (ae.Message.Contains("End() called before IncrementToken() returned false!"))
+                        catch (Exception ae) when (ae.IsAssertionError() && ae.Message.Contains("End() called before IncrementToken() returned false!"))
                         {
                             // Catch & ignore MockTokenizer's
                             // anger...

diff --git a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -631,28 +631,19 @@ protected virtual void AssertEquals(RandomTokenStream tk, FieldType ft, Terms te
                                 Assert.IsTrue(foundPayload);
                             }
                         }
-
-                        // LUCENENET specific - In Lucene, there were assertions set up inside TVReaders which throw AssertionError
-                        // (provided assertions are enabled), which in turn signaled this class to skip the check by catching AssertionError.
-                        // In .NET, assertions are not included in the release and cannot be enabled, so there is nothing to catch.
-                        // We have to explicitly exclude the types that rely on this behavior from the check. Otherwise, they would fall
-                        // through to Assert.Fail().
-                        //
-                        // We also have a fake AssertionException for testing mocks. We cannot throw InvalidOperationException in those
-                        // cases because that exception is expected in other contexts.
-                        Assert.ThrowsAnyOf<InvalidOperationException, AssertionError>(() => docsAndPositionsEnum.NextPosition());
-
-//                        try
-//                        {
-//                            docsAndPositionsEnum.NextPosition();
-//                            Assert.Fail();
-//                        }
-//#pragma warning disable 168
-//                        catch (Exception e) when (e.IsException())
-//#pragma warning restore 168
-//                        {
-//                            // ok
-//                        }
+                        try
+                        {
+                            docsAndPositionsEnum.NextPosition();
+                            Assert.Fail();
+                        }
+                        catch (Exception e) when (e.IsException())
+                        {
+                            // ok
+                        }
+                        catch (Exception e) when (e.IsAssertionError())
+                        {
+                            // ok
+                        }
                     }
                     Assert.AreEqual(DocsEnum.NO_MORE_DOCS, docsAndPositionsEnum.NextDoc());
                 }

diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -778,10 +778,10 @@ public override void Run()
                                 {
                                     // ok
                                 }
-                                catch (NullReferenceException)
-                                {
-                                    // ok
-                                }
+                                //catch (NullReferenceException) // LUCENENET specific - NullReferenceException must be allowed to propagate so we can defensively avoid it in .NET
+                                //{
+                                //    // ok
+                                //}
                                 finally
                                 {
                                     commitLock.Unlock();
@@ -801,15 +801,11 @@ public override void Run()
                                 {
                                     // ok
                                 }
-                                catch (NullReferenceException)
-                                {
-                                    // ok
-                                }
-                                catch (InvalidOperationException) // LUCENENET TODO: This is being caught here because it was used in some places instead of AssertionError, but should remove this and possibly subclass InvalidOperationExcption with AssertionException instead
-                                {
-                                    // ok
-                                }
-                                catch (AssertionException)
+                                //catch (NullReferenceException) // LUCENENET specific - NullReferenceException must be allowed to propagate so we can defensively avoid it in .NET
+                                //{
+                                //    // ok
+                                //}
+                                catch (Exception ae) when (ae.IsAssertionError())
                                 {
                                     // ok
                                 }