Test review for rest of Search, apache#259

src/Lucene.Net.Tests/Search/TestFieldCacheRewriteMethod.cs

@@ -61,22 +61,5 @@ public virtual void TestEquals()
             Assert.IsFalse(a1.Equals(b));
             QueryUtils.Check(a1);
         }
-
-
-
-        #region TestSnapshotDeletionPolicy
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// test a bunch of random regular expressions </summary>
-        [Test]
-        public override void TestRegexps()
-        {
-            base.TestRegexps();
-        }
-
-        #endregion
     }
 }

src/Lucene.Net.Tests/Search/TestLiveFieldValues.cs

@@ -10,7 +10,7 @@
 using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
-#if FEATURE_RANDOM_NEXTINT64_NEXTSINGLE
+#if !FEATURE_RANDOM_NEXTINT64_NEXTSINGLE
 using RandomizedTesting.Generators;
 #endif
 

src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs

@@ -2,11 +2,9 @@
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Documents;
 using Lucene.Net.Index;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System.Collections.Generic;
-using System.Linq;
 using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
@@ -101,12 +99,15 @@ public override void BeforeClass()
             r = DirectoryReader.Open(dir);
             atomicReader = GetOnlySegmentReader(r);
             searcher = new IndexSearcher(atomicReader);
-            searcher.Similarity = new DefaultSimilarityAnonymousClass();
+            searcher.Similarity = DefaultSimilarityAnonymousClass.Default;
         }
 
         private sealed class DefaultSimilarityAnonymousClass : DefaultSimilarity
         {
-            public DefaultSimilarityAnonymousClass()
+            // LUCENENET: making a static readonly instance with private constructor for reduced allocations
+            public static readonly DefaultSimilarityAnonymousClass Default = new DefaultSimilarityAnonymousClass();
+
+            private DefaultSimilarityAnonymousClass()
             {
             }
 
@@ -371,7 +372,7 @@ internal SlowMinShouldMatchScorer(BooleanWeight weight, AtomicReader reader, Ind
                         if (Debugging.AssertsEnabled) Debugging.Assert(success); // no dups
                         TermContext context = TermContext.Build(reader.Context, term);
                         SimWeight w = weight.Similarity.ComputeWeight(1f, searcher.CollectionStatistics("field"), searcher.TermStatistics(term, context));
-                        var dummy = w.GetValueForNormalization(); // ignored
+                        _ = w.GetValueForNormalization(); // ignored
                         w.Normalize(1F, 1F);
                         sims[(int)ord] = weight.Similarity.GetSimScorer(w, (AtomicReaderContext)reader.Context);
                     }
@@ -428,4 +429,4 @@ public override long GetCost()
             }
         }
     }
-}
+}

src/Lucene.Net.Tests/Search/TestMultiPhraseQuery.cs

@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
@@ -354,7 +353,7 @@ private void Add(string s, string type, RandomIndexWriter writer)
         [Test]
         public virtual void TestEmptyToString()
         {
-            (new MultiPhraseQuery()).ToString();
+            _ = new MultiPhraseQuery().ToString();
         }
 
         [Test]
@@ -367,7 +366,7 @@ public virtual void TestCustomIDF()
 
             IndexReader reader = writer.GetReader();
             IndexSearcher searcher = NewSearcher(reader);
-            searcher.Similarity = new DefaultSimilarityAnonymousClass(this);
+            searcher.Similarity = new DefaultSimilarityAnonymousClass();
 
             MultiPhraseQuery query = new MultiPhraseQuery();
             query.Add(new Term[] { new Term("body", "this"), new Term("body", "that") });
@@ -382,13 +381,6 @@ public virtual void TestCustomIDF()
 
         private sealed class DefaultSimilarityAnonymousClass : DefaultSimilarity
         {
-            private readonly TestMultiPhraseQuery outerInstance;
-
-            public DefaultSimilarityAnonymousClass(TestMultiPhraseQuery outerInstance)
-            {
-                this.outerInstance = outerInstance;
-            }
-
             public override Explanation IdfExplain(CollectionStatistics collectionStats, TermStatistics[] termStats)
             {
                 return new Explanation(10f, "just a test");
@@ -462,13 +454,45 @@ private static Token MakeToken(string text, int posIncr)
             return t;
         }
 
-        private static readonly Token[] INCR_0_DOC_TOKENS = new Token[] { MakeToken("x", 1), MakeToken("a", 1), MakeToken("1", 0), MakeToken("m", 1), MakeToken("b", 1), MakeToken("1", 0), MakeToken("n", 1), MakeToken("c", 1), MakeToken("y", 1) };
-
-        private static readonly Token[] INCR_0_QUERY_TOKENS_AND = new Token[] { MakeToken("a", 1), MakeToken("1", 0), MakeToken("b", 1), MakeToken("1", 0), MakeToken("c", 1) };
-
-        private static readonly Token[][] INCR_0_QUERY_TOKENS_AND_OR_MATCH = new Token[][] { new Token[] { MakeToken("a", 1) }, new Token[] { MakeToken("x", 1), MakeToken("1", 0) }, new Token[] { MakeToken("b", 2) }, new Token[] { MakeToken("x", 2), MakeToken("1", 0) }, new Token[] { MakeToken("c", 3) } };
-
-        private static readonly Token[][] INCR_0_QUERY_TOKENS_AND_OR_NO_MATCHN = new Token[][] { new Token[] { MakeToken("x", 1) }, new Token[] { MakeToken("a", 1), MakeToken("1", 0) }, new Token[] { MakeToken("x", 2) }, new Token[] { MakeToken("b", 2), MakeToken("1", 0) }, new Token[] { MakeToken("c", 3) } };
+        private static readonly Token[] INCR_0_DOC_TOKENS = new Token[]
+        {
+            MakeToken("x", 1),
+            MakeToken("a", 1),
+            MakeToken("1", 0),
+            MakeToken("m", 1), // not existing, relying on slop=2
+            MakeToken("b", 1),
+            MakeToken("1", 0),
+            MakeToken("n", 1), // not existing, relying on slop=2
+            MakeToken("c", 1),
+            MakeToken("y", 1)
+        };
+
+        private static readonly Token[] INCR_0_QUERY_TOKENS_AND = new Token[]
+        {
+            MakeToken("a", 1),
+            MakeToken("1", 0),
+            MakeToken("b", 1),
+            MakeToken("1", 0),
+            MakeToken("c", 1)
+        };
+
+        private static readonly Token[][] INCR_0_QUERY_TOKENS_AND_OR_MATCH = new Token[][]
+        {
+            new[] { MakeToken("a", 1) },
+            new[] { MakeToken("x", 1), MakeToken("1", 0) },
+            new[] { MakeToken("b", 2) },
+            new[] { MakeToken("x", 2), MakeToken("1", 0) },
+            new[] { MakeToken("c", 3) }
+        };
+
+        private static readonly Token[][] INCR_0_QUERY_TOKENS_AND_OR_NO_MATCHN = new Token[][]
+        {
+            new[] { MakeToken("x", 1) },
+            new[] { MakeToken("a", 1), MakeToken("1", 0) },
+            new[] { MakeToken("x", 2) },
+            new[] { MakeToken("b", 2), MakeToken("1", 0) },
+            new[] { MakeToken("c", 3) }
+        };
 
         /// <summary>
         /// using query parser, MPQ will be created, and will not be strict about having all query terms
@@ -626,4 +650,4 @@ public virtual void TestNegativeSlop()
             }
         }
     }
-}
+}

src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs

@@ -50,10 +50,6 @@ public class TestMultiTermConstantScore : BaseTestRangeFilter
         internal /*static*/ Directory small;
         internal /*static*/ IndexReader reader;
 
-        /// <summary>
-        /// LUCENENET specific
-        /// Is non-static because NewIndexWriterConfig is no longer static.
-        /// </summary>
         [OneTimeSetUp]
         public override void BeforeClass()
         {
@@ -95,7 +91,7 @@ public override void AfterClass()
         public static Query Csrq(string f, string l, string h, bool il, bool ih)
         {
             TermRangeQuery query = TermRangeQuery.NewStringRange(f, l, h, il, ih);
-            query.MultiTermRewriteMethod = (MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
+            query.MultiTermRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
             if (Verbose)
             {
                 Console.WriteLine("TEST: query=" + query);
@@ -106,7 +102,7 @@ public static Query Csrq(string f, string l, string h, bool il, bool ih)
         public static Query Csrq(string f, string l, string h, bool il, bool ih, MultiTermQuery.RewriteMethod method)
         {
             TermRangeQuery query = TermRangeQuery.NewStringRange(f, l, h, il, ih);
-            query.MultiTermRewriteMethod = (method);
+            query.MultiTermRewriteMethod = method;
             if (Verbose)
             {
                 Console.WriteLine("TEST: query=" + query + " method=" + method);
@@ -119,7 +115,7 @@ public static Query Csrq(string f, string l, string h, bool il, bool ih, MultiTe
         public static Query Cspq(Term prefix)
         {
             PrefixQuery query = new PrefixQuery(prefix);
-            query.MultiTermRewriteMethod = (MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
+            query.MultiTermRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
             return query;
         }
 
@@ -128,7 +124,7 @@ public static Query Cspq(Term prefix)
         public static Query Cswcq(Term wild)
         {
             WildcardQuery query = new WildcardQuery(wild);
-            query.MultiTermRewriteMethod = (MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
+            query.MultiTermRewriteMethod = MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE;
             return query;
         }
 
@@ -242,7 +238,7 @@ public virtual void TestBoost()
             search.Similarity = new DefaultSimilarity();
             Query q = Csrq("data", "1", "6", T, T);
             q.Boost = 100;
-            search.Search(q, null, new CollectorAnonymousClass(this));
+            search.Search(q, null, new CollectorAnonymousClass());
 
             //
             // Ensure that boosting works to score one clause of a query higher
@@ -287,15 +283,7 @@ public virtual void TestBoost()
 
         private sealed class CollectorAnonymousClass : ICollector
         {
-            private readonly TestMultiTermConstantScore outerInstance;
-
-            public CollectorAnonymousClass(TestMultiTermConstantScore outerInstance)
-            {
-                this.outerInstance = outerInstance;
-                @base = 0;
-            }
-
-            private int @base;
+            private int @base = 0;
             private Scorer scorer;
 
             public void SetScorer(Scorer scorer)
@@ -544,4 +532,4 @@ public virtual void TestRangeQueryRand()
             assertEquals("max,nul,T,T", 1, result.Length);
         }
     }
-}
+}

src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs

@@ -137,7 +137,7 @@ private void CheckBooleanQueryOrder(Query q)
         private void CheckDuplicateTerms(MultiTermQuery.RewriteMethod method)
         {
             MultiTermQuery mtq = TermRangeQuery.NewStringRange("data", "2", "7", true, true);
-            mtq.MultiTermRewriteMethod = (method);
+            mtq.MultiTermRewriteMethod = method;
             Query q1 = searcher.Rewrite(mtq);
             Query q2 = multiSearcher.Rewrite(mtq);
             Query q3 = multiSearcherDupls.Rewrite(mtq);
@@ -184,8 +184,8 @@ private void CheckBooleanQueryBoosts(BooleanQuery bq)
 
         private void CheckBoosts(MultiTermQuery.RewriteMethod method)
         {
-            MultiTermQuery mtq = new MultiTermQueryAnonymousClass(this);
-            mtq.MultiTermRewriteMethod = (method);
+            MultiTermQuery mtq = new MultiTermQueryAnonymousClass();
+            mtq.MultiTermRewriteMethod = method;
             Query q1 = searcher.Rewrite(mtq);
             Query q2 = multiSearcher.Rewrite(mtq);
             Query q3 = multiSearcherDupls.Rewrite(mtq);
@@ -205,27 +205,21 @@ private void CheckBoosts(MultiTermQuery.RewriteMethod method)
 
         private sealed class MultiTermQueryAnonymousClass : MultiTermQuery
         {
-            private readonly TestMultiTermQueryRewrites outerInstance;
-
-            public MultiTermQueryAnonymousClass(TestMultiTermQueryRewrites outerInstance)
+            public MultiTermQueryAnonymousClass()
                 : base("data")
             {
-                this.outerInstance = outerInstance;
             }
 
             protected override TermsEnum GetTermsEnum(Terms terms, AttributeSource atts)
             {
-                return new TermRangeTermsEnumAnonymousClass(this, terms.GetEnumerator(), new BytesRef("2"), new BytesRef("7"));
+                return new TermRangeTermsEnumAnonymousClass(terms.GetEnumerator(), new BytesRef("2"), new BytesRef("7"));
             }
 
             private sealed class TermRangeTermsEnumAnonymousClass : TermRangeTermsEnum
             {
-                private readonly MultiTermQueryAnonymousClass outerInstance;
-
-                public TermRangeTermsEnumAnonymousClass(MultiTermQueryAnonymousClass outerInstance, TermsEnum iterator, BytesRef bref1, BytesRef bref2)
+                public TermRangeTermsEnumAnonymousClass(TermsEnum iterator, BytesRef bref1, BytesRef bref2)
                     : base(iterator, bref1, bref2, true, true)
                 {
-                    this.outerInstance = outerInstance;
                     boostAtt = Attributes.AddAttribute<IBoostAttribute>();
                 }
 
@@ -305,4 +299,4 @@ public virtual void TestMaxClauseLimitations()
             CheckNoMaxClauseLimitation(new MultiTermQuery.TopTermsBoostOnlyBooleanQueryRewrite(1024));
         }
     }
-}
+}

src/Lucene.Net.Tests/Search/TestMultiThreadTermVectors.cs

@@ -2,10 +2,8 @@
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support.Threading;
 using NUnit.Framework;
 using System;
-using System.IO;
 using System.Text;
 using System.Threading;
 using Console = Lucene.Net.Util.SystemConsole;
@@ -60,7 +58,7 @@ public override void SetUp()
             customType.StoreTermVectors = true;
             for (int i = 0; i < numDocs; i++)
             {
-                Documents.Document doc = new Documents.Document();
+                Document doc = new Document();
                 Field fld = NewField("field", English.Int32ToEnglish(i), customType);
                 doc.Add(fld);
                 writer.AddDocument(doc);
@@ -98,8 +96,7 @@ public virtual void Test()
                 {
                     try
                     {
-                        /// <summary>
-                        /// close the opened reader </summary>
+                        // close the opened reader
                         reader.Dispose();
                     }
                     catch (Exception ioe) when (ioe.IsIOException())
@@ -240,4 +237,4 @@ private void VerifyVector(TermsEnum vector, int num)
             }
         }
     }
-}
+}

src/Lucene.Net.Tests/Search/TestNot.cs

@@ -31,8 +31,6 @@ namespace Lucene.Net.Search
 
     /// <summary>
     /// Similarity unit test.
-    ///
-    ///
     /// </summary>
     [TestFixture]
     public class TestNot : LuceneTestCase
@@ -62,4 +60,4 @@ public virtual void TestNot_Mem()
             store.Dispose();
         }
     }
-}
+}