http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs index c8b7600..039eb19 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs @@ -1,3 +1,4 @@ +using Lucene.Net.Index; using System; using System.Collections.Generic; @@ -73,7 +74,7 @@ namespace Lucene.Net.Codecs.Lucene40 MatchNoBits bits = new MatchNoBits(indexReader.MaxDoc); while ((iterator.Next()) != null) { - DocsEnum docs = iterator.Docs(Random().NextBoolean() ? bits : new MatchNoBits(indexReader.MaxDoc), null, Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + DocsEnum docs = iterator.Docs(Random().NextBoolean() ? bits : new MatchNoBits(indexReader.MaxDoc), null, Random().NextBoolean() ? DocsFlags.FREQS : DocsFlags.NONE); enums[docs] = true; } @@ -103,7 +104,7 @@ namespace Lucene.Net.Codecs.Lucene40 DocsEnum docs = null; while ((iterator.Next()) != null) { - docs = iterator.Docs(bits, docs, Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + docs = iterator.Docs(bits, docs, Random().NextBoolean() ? DocsFlags.FREQS : DocsFlags.NONE); enums[docs] = true; } @@ -113,7 +114,7 @@ namespace Lucene.Net.Codecs.Lucene40 docs = null; while ((iterator.Next()) != null) { - docs = iterator.Docs(new MatchNoBits(open.MaxDoc), docs, Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + docs = iterator.Docs(new MatchNoBits(open.MaxDoc), docs, Random().NextBoolean() ? DocsFlags.FREQS : DocsFlags.NONE); enums[docs] = true; } Assert.AreEqual(terms.Count, enums.Count); @@ -123,7 +124,7 @@ namespace Lucene.Net.Codecs.Lucene40 docs = null; while ((iterator.Next()) != null) { - docs = iterator.Docs(null, docs, Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + docs = iterator.Docs(null, docs, Random().NextBoolean() ? DocsFlags.FREQS : DocsFlags.NONE); enums[docs] = true; } Assert.AreEqual(1, enums.Count); @@ -161,7 +162,7 @@ namespace Lucene.Net.Codecs.Lucene40 BytesRef term = null; while ((term = iterator.Next()) != null) { - docs = iterator.Docs(null, RandomDocsEnum("body", term, leaves2, bits), Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + docs = iterator.Docs(null, RandomDocsEnum("body", term, leaves2, bits), Random().NextBoolean() ? DocsFlags.FREQS : DocsFlags.NONE); enums[docs] = true; } Assert.AreEqual(terms.Count, enums.Count); @@ -171,7 +172,7 @@ namespace Lucene.Net.Codecs.Lucene40 docs = null; while ((term = iterator.Next()) != null) { - docs = iterator.Docs(bits, RandomDocsEnum("body", term, leaves2, bits), Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + docs = iterator.Docs(bits, RandomDocsEnum("body", term, leaves2, bits), Random().NextBoolean() ? DocsFlags.FREQS : DocsFlags.NONE); enums[docs] = true; } Assert.AreEqual(terms.Count, enums.Count); @@ -194,7 +195,7 @@ namespace Lucene.Net.Codecs.Lucene40 TermsEnum iterator = terms.GetIterator(null); if (iterator.SeekExact(term)) { - return iterator.Docs(bits, null, Random().NextBoolean() ? DocsEnum.FLAG_FREQS : DocsEnum.FLAG_NONE); + return iterator.Docs(bits, null, Random().NextBoolean() ? DocsFlags.FREQS : DocsFlags.NONE); } return null; }
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs index aa3e730..f074ab7 100644 --- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs +++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestBlockPostingsFormat3.cs @@ -382,16 +382,16 @@ namespace Lucene.Net.Codecs.Lucene41 AssertDocsEnum(leftDocs = leftTermsEnum.Docs(randomBits, leftDocs), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs)); // w/o freqs: - AssertDocsEnum(leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsEnum.FLAG_NONE)); - AssertDocsEnum(leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsEnum.FLAG_NONE)); + AssertDocsEnum(leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsFlags.NONE)); + AssertDocsEnum(leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsFlags.NONE)); // with freqs: AssertDocsSkipping(leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(null, leftDocs), rightDocs = rightTermsEnum.Docs(null, rightDocs)); AssertDocsSkipping(leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs)); // w/o freqs: - AssertDocsSkipping(leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsEnum.FLAG_NONE)); - AssertDocsSkipping(leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsEnum.FLAG_NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsEnum.FLAG_NONE)); + AssertDocsSkipping(leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(null, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(null, rightDocs, DocsFlags.NONE)); + AssertDocsSkipping(leftTermsEnum.DocFreq, leftDocs = leftTermsEnum.Docs(randomBits, leftDocs, DocsFlags.NONE), rightDocs = rightTermsEnum.Docs(randomBits, rightDocs, DocsFlags.NONE)); } } Assert.IsNull(rightTermsEnum.Next()); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestAddIndexes.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs index 5389e74..e3e18e5 100644 --- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs +++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs @@ -521,7 +521,7 @@ namespace Lucene.Net.Index private void VerifyTermDocs(Directory dir, Term term, int numDocs) { IndexReader reader = DirectoryReader.Open(dir); - DocsEnum docsEnum = TestUtil.Docs(Random(), reader, term.Field, term.Bytes, null, null, DocsEnum.FLAG_NONE); + DocsEnum docsEnum = TestUtil.Docs(Random(), reader, term.Field, term.Bytes, null, null, DocsFlags.NONE); int count = 0; while (docsEnum.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs index 16fdd5f..cb78dec 100644 --- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs +++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs @@ -802,7 +802,7 @@ namespace Lucene.Net.Index // should be found exactly Assert.AreEqual(TermsEnum.SeekStatus.FOUND, terms.SeekCeil(aaaTerm)); - Assert.AreEqual(35, CountDocs(TestUtil.Docs(Random(), terms, null, null, DocsEnum.FLAG_NONE))); + Assert.AreEqual(35, CountDocs(TestUtil.Docs(Random(), terms, null, null, DocsFlags.NONE))); Assert.IsNull(terms.Next()); // should hit end of field @@ -812,11 +812,11 @@ namespace Lucene.Net.Index // should seek to aaa Assert.AreEqual(TermsEnum.SeekStatus.NOT_FOUND, terms.SeekCeil(new BytesRef("a"))); Assert.IsTrue(terms.Term.BytesEquals(aaaTerm)); - Assert.AreEqual(35, CountDocs(TestUtil.Docs(Random(), terms, null, null, DocsEnum.FLAG_NONE))); + Assert.AreEqual(35, CountDocs(TestUtil.Docs(Random(), terms, null, null, DocsFlags.NONE))); Assert.IsNull(terms.Next()); Assert.AreEqual(TermsEnum.SeekStatus.FOUND, terms.SeekCeil(aaaTerm)); - Assert.AreEqual(35, CountDocs(TestUtil.Docs(Random(), terms, null, null, DocsEnum.FLAG_NONE))); + Assert.AreEqual(35, CountDocs(TestUtil.Docs(Random(), terms, null, null, DocsFlags.NONE))); Assert.IsNull(terms.Next()); r.Dispose(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestCodecs.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestCodecs.cs b/src/Lucene.Net.Tests/Index/TestCodecs.cs index 58d5aa9..9fabb90 100644 --- a/src/Lucene.Net.Tests/Index/TestCodecs.cs +++ b/src/Lucene.Net.Tests/Index/TestCodecs.cs @@ -422,7 +422,7 @@ namespace Lucene.Net.Index // internal state: for (int iter = 0; iter < 2; iter++) { - docsEnum = TestUtil.Docs(Random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE); + docsEnum = TestUtil.Docs(Random(), termsEnum, null, docsEnum, DocsFlags.NONE); Assert.AreEqual(terms[i].Docs[0], docsEnum.NextDoc()); Assert.AreEqual(DocIdSetIterator.NO_MORE_DOCS, docsEnum.NextDoc()); } @@ -660,7 +660,7 @@ namespace Lucene.Net.Index Assert.AreEqual(term2.Docs.Length, termsEnum.DocFreq); if (field.OmitTF) { - this.VerifyDocs(term2.Docs, term2.Positions, TestUtil.Docs(Random(), termsEnum, null, null, DocsEnum.FLAG_NONE), false); + this.VerifyDocs(term2.Docs, term2.Positions, TestUtil.Docs(Random(), termsEnum, null, null, DocsFlags.NONE), false); } else { @@ -689,7 +689,7 @@ namespace Lucene.Net.Index Assert.AreEqual(term2.Docs.Length, termsEnum.DocFreq); if (field.OmitTF) { - this.VerifyDocs(term2.Docs, term2.Positions, TestUtil.Docs(Random(), termsEnum, null, null, DocsEnum.FLAG_NONE), false); + this.VerifyDocs(term2.Docs, term2.Positions, TestUtil.Docs(Random(), termsEnum, null, null, DocsFlags.NONE), false); } else { @@ -764,14 +764,14 @@ namespace Lucene.Net.Index } else { - docs = docsAndFreqs = TestUtil.Docs(Random(), termsEnum, null, null, DocsEnum.FLAG_FREQS); + docs = docsAndFreqs = TestUtil.Docs(Random(), termsEnum, null, null, DocsFlags.FREQS); } } else { postings = null; docsAndFreqs = null; - docs = TestUtil.Docs(Random(), termsEnum, null, null, DocsEnum.FLAG_NONE); + docs = TestUtil.Docs(Random(), termsEnum, null, null, DocsFlags.NONE); } Assert.IsNotNull(docs); int upto2 = -1; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestDocCount.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestDocCount.cs b/src/Lucene.Net.Tests/Index/TestDocCount.cs index 3ac9a3c..0c83754 100644 --- a/src/Lucene.Net.Tests/Index/TestDocCount.cs +++ b/src/Lucene.Net.Tests/Index/TestDocCount.cs @@ -88,7 +88,7 @@ namespace Lucene.Net.Index TermsEnum te = terms.GetIterator(null); while (te.Next() != null) { - DocsEnum de = TestUtil.Docs(Random(), te, null, null, DocsEnum.FLAG_NONE); + DocsEnum de = TestUtil.Docs(Random(), te, null, null, DocsFlags.NONE); while (de.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { visited.Set(de.DocID); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs index 03ba737..69a85b8 100644 --- a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs +++ b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs @@ -251,7 +251,7 @@ namespace Lucene.Net.Index foreach (AtomicReaderContext context in topReaderContext.Leaves) { int maxDoc = context.AtomicReader.MaxDoc; - DocsEnum docsEnum = TestUtil.Docs(Random(), context.Reader, FieldName, bytes, null, null, DocsEnum.FLAG_FREQS); + DocsEnum docsEnum = TestUtil.Docs(Random(), context.Reader, FieldName, bytes, null, null, DocsFlags.FREQS); if (FindNext(freqInDoc, context.DocBase, context.DocBase + maxDoc) == int.MaxValue) { Assert.IsNull(docsEnum); @@ -383,7 +383,7 @@ namespace Lucene.Net.Index writer.AddDocument(doc); DirectoryReader reader = writer.Reader; AtomicReader r = GetOnlySegmentReader(reader); - DocsEnum disi = TestUtil.Docs(Random(), r, "foo", new BytesRef("bar"), null, null, DocsEnum.FLAG_NONE); + DocsEnum disi = TestUtil.Docs(Random(), r, "foo", new BytesRef("bar"), null, null, DocsFlags.NONE); int docid = disi.DocID; Assert.AreEqual(-1, docid); Assert.IsTrue(disi.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); @@ -391,7 +391,7 @@ namespace Lucene.Net.Index // now reuse and check again TermsEnum te = r.Terms("foo").GetIterator(null); Assert.IsTrue(te.SeekExact(new BytesRef("bar"))); - disi = TestUtil.Docs(Random(), te, null, disi, DocsEnum.FLAG_NONE); + disi = TestUtil.Docs(Random(), te, null, disi, DocsFlags.NONE); docid = disi.DocID; Assert.AreEqual(-1, docid); Assert.IsTrue(disi.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestIndexWriter.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs index 0669953..88ab444 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs @@ -653,7 +653,7 @@ namespace Lucene.Net.Index Assert.AreEqual(1, reader.NumDocs); Term t = new Term("field", "a"); Assert.AreEqual(1, reader.DocFreq(t)); - DocsEnum td = TestUtil.Docs(Random(), reader, "field", new BytesRef("a"), MultiFields.GetLiveDocs(reader), null, DocsEnum.FLAG_FREQS); + DocsEnum td = TestUtil.Docs(Random(), reader, "field", new BytesRef("a"), MultiFields.GetLiveDocs(reader), null, DocsFlags.FREQS); td.NextDoc(); Assert.AreEqual(128 * 1024, td.Freq); reader.Dispose(); @@ -1541,12 +1541,12 @@ namespace Lucene.Net.Index Assert.AreEqual("value", ir.Document(2).Get("string")); // test that the terms were indexed. - Assert.IsTrue(TestUtil.Docs(Random(), ir, "binary", new BytesRef("doc1field1"), null, null, DocsEnum.FLAG_NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); - Assert.IsTrue(TestUtil.Docs(Random(), ir, "binary", new BytesRef("doc2field1"), null, null, DocsEnum.FLAG_NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); - Assert.IsTrue(TestUtil.Docs(Random(), ir, "binary", new BytesRef("doc3field1"), null, null, DocsEnum.FLAG_NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); - Assert.IsTrue(TestUtil.Docs(Random(), ir, "string", new BytesRef("doc1field2"), null, null, DocsEnum.FLAG_NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); - Assert.IsTrue(TestUtil.Docs(Random(), ir, "string", new BytesRef("doc2field2"), null, null, DocsEnum.FLAG_NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); - Assert.IsTrue(TestUtil.Docs(Random(), ir, "string", new BytesRef("doc3field2"), null, null, DocsEnum.FLAG_NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); + Assert.IsTrue(TestUtil.Docs(Random(), ir, "binary", new BytesRef("doc1field1"), null, null, DocsFlags.NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); + Assert.IsTrue(TestUtil.Docs(Random(), ir, "binary", new BytesRef("doc2field1"), null, null, DocsFlags.NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); + Assert.IsTrue(TestUtil.Docs(Random(), ir, "binary", new BytesRef("doc3field1"), null, null, DocsFlags.NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); + Assert.IsTrue(TestUtil.Docs(Random(), ir, "string", new BytesRef("doc1field2"), null, null, DocsFlags.NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); + Assert.IsTrue(TestUtil.Docs(Random(), ir, "string", new BytesRef("doc2field2"), null, null, DocsFlags.NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); + Assert.IsTrue(TestUtil.Docs(Random(), ir, "string", new BytesRef("doc3field2"), null, null, DocsFlags.NONE).NextDoc() != DocIdSetIterator.NO_MORE_DOCS); ir.Dispose(); dir.Dispose(); @@ -1586,7 +1586,7 @@ namespace Lucene.Net.Index int count = 0; while (t.Next() != null) { - DocsEnum docs = TestUtil.Docs(Random(), t, null, null, DocsEnum.FLAG_NONE); + DocsEnum docs = TestUtil.Docs(Random(), t, null, null, DocsFlags.NONE); Assert.AreEqual(0, docs.NextDoc()); Assert.AreEqual(DocIdSetIterator.NO_MORE_DOCS, docs.NextDoc()); count++; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs index 86f4fde..a338db8 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs @@ -1266,7 +1266,7 @@ namespace Lucene.Net.Index SegmentReader r = GetOnlySegmentReader(DirectoryReader.Open(w, true)); try { - TestUtil.Docs(Random(), r, "f", new BytesRef("val"), null, null, DocsEnum.FLAG_NONE); + TestUtil.Docs(Random(), r, "f", new BytesRef("val"), null, null, DocsFlags.NONE); Assert.Fail("should have failed to seek since terms index was not loaded."); } #pragma warning disable 168 http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestLongPostings.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestLongPostings.cs b/src/Lucene.Net.Tests/Index/TestLongPostings.cs index 840fee7..1147b9e 100644 --- a/src/Lucene.Net.Tests/Index/TestLongPostings.cs +++ b/src/Lucene.Net.Tests/Index/TestLongPostings.cs @@ -455,12 +455,12 @@ namespace Lucene.Net.Index if (options == IndexOptions.DOCS_ONLY) { - docs = TestUtil.Docs(Random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_NONE); + docs = TestUtil.Docs(Random(), r, "field", new BytesRef(term), null, null, DocsFlags.NONE); postings = null; } else { - docs = postings = TestUtil.Docs(Random(), r, "field", new BytesRef(term), null, null, DocsEnum.FLAG_FREQS); + docs = postings = TestUtil.Docs(Random(), r, "field", new BytesRef(term), null, null, DocsFlags.FREQS); Debug.Assert(postings != null); } Debug.Assert(docs != null); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestMultiFields.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestMultiFields.cs b/src/Lucene.Net.Tests/Index/TestMultiFields.cs index 0d70862..f30958d 100644 --- a/src/Lucene.Net.Tests/Index/TestMultiFields.cs +++ b/src/Lucene.Net.Tests/Index/TestMultiFields.cs @@ -152,7 +152,7 @@ namespace Lucene.Net.Index Console.WriteLine("TEST: seek term=" + UnicodeUtil.ToHexString(term.Utf8ToString()) + " " + term); } - DocsEnum docsEnum = TestUtil.Docs(Random(), reader, "field", term, liveDocs, null, DocsEnum.FLAG_NONE); + DocsEnum docsEnum = TestUtil.Docs(Random(), reader, "field", term, liveDocs, null, DocsFlags.NONE); Assert.IsNotNull(docsEnum); foreach (int docID in docs[term]) @@ -197,8 +197,8 @@ namespace Lucene.Net.Index w.AddDocument(d); IndexReader r = w.Reader; w.Dispose(); - DocsEnum d1 = TestUtil.Docs(Random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE); - DocsEnum d2 = TestUtil.Docs(Random(), r, "f", new BytesRef("j"), null, null, DocsEnum.FLAG_NONE); + DocsEnum d1 = TestUtil.Docs(Random(), r, "f", new BytesRef("j"), null, null, DocsFlags.NONE); + DocsEnum d2 = TestUtil.Docs(Random(), r, "f", new BytesRef("j"), null, null, DocsFlags.NONE); Assert.AreEqual(0, d1.NextDoc()); Assert.AreEqual(0, d2.NextDoc()); r.Dispose(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestOmitPositions.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs index ff8ae7d..eaeae23 100644 --- a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs +++ b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs @@ -61,7 +61,7 @@ namespace Lucene.Net.Index Assert.IsNull(MultiFields.GetTermPositionsEnum(reader, null, "foo", new BytesRef("test"))); - DocsEnum de = TestUtil.Docs(Random(), reader, "foo", new BytesRef("test"), null, null, DocsEnum.FLAG_FREQS); + DocsEnum de = TestUtil.Docs(Random(), reader, "foo", new BytesRef("test"), null, null, DocsFlags.FREQS); while (de.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { Assert.AreEqual(2, de.Freq); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs b/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs index 9b6ac85..d563270 100644 --- a/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs +++ b/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs @@ -88,7 +88,7 @@ namespace Lucene.Net.Index BytesRef b = te.Next(); Assert.IsNotNull(b); Assert.AreEqual(t, b.Utf8ToString()); - DocsEnum td = TestUtil.Docs(Random(), te, liveDocs, null, DocsEnum.FLAG_NONE); + DocsEnum td = TestUtil.Docs(Random(), te, liveDocs, null, DocsFlags.NONE); Assert.IsTrue(td.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); Assert.AreEqual(0, td.DocID); Assert.AreEqual(td.NextDoc(), DocIdSetIterator.NO_MORE_DOCS); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs index ce7e767..1901abe 100644 --- a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs +++ b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs @@ -249,7 +249,7 @@ namespace Lucene.Net.Index TermsEnum ctermsEnum = cterms.GetIterator(null); if (ctermsEnum.SeekExact(new BytesRef(term.Text()))) { - DocsEnum docsEnum = TestUtil.Docs(Random(), ctermsEnum, bits, null, DocsEnum.FLAG_NONE); + DocsEnum docsEnum = TestUtil.Docs(Random(), ctermsEnum, bits, null, DocsFlags.NONE); return ToArray(docsEnum); } return null; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs b/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs index f876774..3990e28 100644 --- a/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs +++ b/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs @@ -75,7 +75,7 @@ namespace Lucene.Net.Index TermsEnum terms = reader.Fields.GetTerms(DocHelper.TEXT_FIELD_2_KEY).GetIterator(null); terms.SeekCeil(new BytesRef("field")); - DocsEnum termDocs = TestUtil.Docs(Random(), terms, reader.LiveDocs, null, DocsEnum.FLAG_FREQS); + DocsEnum termDocs = TestUtil.Docs(Random(), terms, reader.LiveDocs, null, DocsFlags.FREQS); if (termDocs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { int docId = termDocs.DocID; @@ -148,7 +148,7 @@ namespace Lucene.Net.Index IndexReader reader = DirectoryReader.Open(dir, indexDivisor); - DocsEnum tdocs = TestUtil.Docs(Random(), reader, ta.Field, new BytesRef(ta.Text()), MultiFields.GetLiveDocs(reader), null, DocsEnum.FLAG_FREQS); + DocsEnum tdocs = TestUtil.Docs(Random(), reader, ta.Field, new BytesRef(ta.Text()), MultiFields.GetLiveDocs(reader), null, DocsFlags.FREQS); // without optimization (assumption skipInterval == 16) @@ -181,7 +181,7 @@ namespace Lucene.Net.Index // exactly skipInterval documents and therefore with optimization // with next - tdocs = TestUtil.Docs(Random(), reader, tb.Field, new BytesRef(tb.Text()), MultiFields.GetLiveDocs(reader), null, DocsEnum.FLAG_FREQS); + tdocs = TestUtil.Docs(Random(), reader, tb.Field, new BytesRef(tb.Text()), MultiFields.GetLiveDocs(reader), null, DocsFlags.FREQS); Assert.IsTrue(tdocs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); Assert.AreEqual(10, tdocs.DocID); @@ -200,7 +200,7 @@ namespace Lucene.Net.Index Assert.IsFalse(tdocs.Advance(26) != DocIdSetIterator.NO_MORE_DOCS); // without next - tdocs = TestUtil.Docs(Random(), reader, tb.Field, new BytesRef(tb.Text()), MultiFields.GetLiveDocs(reader), null, DocsEnum.FLAG_FREQS); + tdocs = TestUtil.Docs(Random(), reader, tb.Field, new BytesRef(tb.Text()), MultiFields.GetLiveDocs(reader), null, DocsFlags.FREQS); Assert.IsTrue(tdocs.Advance(5) != DocIdSetIterator.NO_MORE_DOCS); Assert.AreEqual(10, tdocs.DocID); @@ -215,7 +215,7 @@ namespace Lucene.Net.Index // much more than skipInterval documents and therefore with optimization // with next - tdocs = TestUtil.Docs(Random(), reader, tc.Field, new BytesRef(tc.Text()), MultiFields.GetLiveDocs(reader), null, DocsEnum.FLAG_FREQS); + tdocs = TestUtil.Docs(Random(), reader, tc.Field, new BytesRef(tc.Text()), MultiFields.GetLiveDocs(reader), null, DocsFlags.FREQS); Assert.IsTrue(tdocs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); Assert.AreEqual(26, tdocs.DocID); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestStressAdvance.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs index c6c4521..7578aff 100644 --- a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs +++ b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs @@ -101,11 +101,11 @@ namespace Lucene.Net.Index Console.WriteLine("\nTEST: iter=" + iter + " iter2=" + iter2); } Assert.AreEqual(TermsEnum.SeekStatus.FOUND, te.SeekCeil(new BytesRef("a"))); - de = TestUtil.Docs(Random(), te, null, de, DocsEnum.FLAG_NONE); + de = TestUtil.Docs(Random(), te, null, de, DocsFlags.NONE); TestOne(de, aDocIDs); Assert.AreEqual(TermsEnum.SeekStatus.FOUND, te.SeekCeil(new BytesRef("b"))); - de = TestUtil.Docs(Random(), te, null, de, DocsEnum.FLAG_NONE); + de = TestUtil.Docs(Random(), te, null, de, DocsFlags.NONE); TestOne(de, bDocIDs); } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs index f073cb4..fc9b52a 100644 --- a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs +++ b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs @@ -386,7 +386,7 @@ namespace Lucene.Net.Index DocsEnum docs = null; while (termsEnum.Next() != null) { - docs = TestUtil.Docs(Random(), termsEnum, liveDocs, docs, DocsEnum.FLAG_NONE); + docs = TestUtil.Docs(Random(), termsEnum, liveDocs, docs, DocsFlags.NONE); while (docs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { Assert.Fail("r1 is not empty but r2 is"); @@ -409,10 +409,10 @@ namespace Lucene.Net.Index break; } - termDocs1 = TestUtil.Docs(Random(), termsEnum, liveDocs1, termDocs1, DocsEnum.FLAG_NONE); + termDocs1 = TestUtil.Docs(Random(), termsEnum, liveDocs1, termDocs1, DocsFlags.NONE); if (termsEnum2.SeekExact(term)) { - termDocs2 = TestUtil.Docs(Random(), termsEnum2, liveDocs2, termDocs2, DocsEnum.FLAG_NONE); + termDocs2 = TestUtil.Docs(Random(), termsEnum2, liveDocs2, termDocs2, DocsFlags.NONE); } else { @@ -485,7 +485,7 @@ namespace Lucene.Net.Index } else { - dEnum = TestUtil.Docs(Random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS); + dEnum = TestUtil.Docs(Random(), termsEnum3, null, dEnum, DocsFlags.FREQS); Assert.IsNotNull(dEnum); Assert.IsTrue(dEnum.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); int freq = dEnum.Freq; @@ -524,7 +524,7 @@ namespace Lucene.Net.Index } else { - dEnum = TestUtil.Docs(Random(), termsEnum3, null, dEnum, DocsEnum.FLAG_FREQS); + dEnum = TestUtil.Docs(Random(), termsEnum3, null, dEnum, DocsFlags.FREQS); Assert.IsNotNull(dEnum); Assert.IsTrue(dEnum.NextDoc() != DocIdSetIterator.NO_MORE_DOCS); int freq = dEnum.Freq; @@ -588,7 +588,7 @@ namespace Lucene.Net.Index } //System.out.println("TEST: term1=" + term1); - docs1 = TestUtil.Docs(Random(), termsEnum1, liveDocs1, docs1, DocsEnum.FLAG_FREQS); + docs1 = TestUtil.Docs(Random(), termsEnum1, liveDocs1, docs1, DocsFlags.FREQS); while (docs1.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { int d = docs1.DocID; @@ -630,7 +630,7 @@ namespace Lucene.Net.Index } //System.out.println("TEST: term1=" + term1); - docs2 = TestUtil.Docs(Random(), termsEnum2, liveDocs2, docs2, DocsEnum.FLAG_FREQS); + docs2 = TestUtil.Docs(Random(), termsEnum2, liveDocs2, docs2, DocsFlags.FREQS); while (docs2.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { int d = r2r1[docs2.DocID]; @@ -778,8 +778,8 @@ namespace Lucene.Net.Index } else { - dEnum1 = TestUtil.Docs(Random(), termsEnum1, null, dEnum1, DocsEnum.FLAG_FREQS); - dEnum2 = TestUtil.Docs(Random(), termsEnum2, null, dEnum2, DocsEnum.FLAG_FREQS); + dEnum1 = TestUtil.Docs(Random(), termsEnum1, null, dEnum1, DocsFlags.FREQS); + dEnum2 = TestUtil.Docs(Random(), termsEnum2, null, dEnum2, DocsFlags.FREQS); Assert.IsNotNull(dEnum1); Assert.IsNotNull(dEnum2); int docID1 = dEnum1.NextDoc(); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs index 8426151..44e5d10 100644 --- a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs +++ b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs @@ -283,7 +283,7 @@ namespace Lucene.Net.Index //System.out.println("Term: " + term); Assert.AreEqual(TestTerms[i], term); - docsEnum = TestUtil.Docs(Random(), termsEnum, null, docsEnum, DocsEnum.FLAG_NONE); + docsEnum = TestUtil.Docs(Random(), termsEnum, null, docsEnum, DocsFlags.NONE); Assert.IsNotNull(docsEnum); int doc = docsEnum.DocID; Assert.AreEqual(-1, doc); http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs b/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs index aa76324..1d9a028 100644 --- a/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs +++ b/src/Lucene.Net.Tests/Index/TestTermdocPerf.cs @@ -147,7 +147,7 @@ namespace Lucene.Net.Index for (int i = 0; i < iter; i++) { tenum.SeekCeil(new BytesRef("val")); - tdocs = TestUtil.Docs(random, tenum, MultiFields.GetLiveDocs(reader), tdocs, DocsEnum.FLAG_NONE); + tdocs = TestUtil.Docs(random, tenum, MultiFields.GetLiveDocs(reader), tdocs, DocsFlags.NONE); while (tdocs.NextDoc() != DocIdSetIterator.NO_MORE_DOCS) { ret += tdocs.DocID; http://git-wip-us.apache.org/repos/asf/lucenenet/blob/418e5440/src/Lucene.Net.Tests/Index/TestTermsEnum.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs index ed848b3..09a2ace 100644 --- a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs +++ b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs @@ -419,7 +419,7 @@ namespace Lucene.Net.Index } Assert.AreEqual(expected, actual); Assert.AreEqual(1, te.DocFreq); - docsEnum = TestUtil.Docs(Random(), te, null, docsEnum, DocsEnum.FLAG_NONE); + docsEnum = TestUtil.Docs(Random(), te, null, docsEnum, DocsFlags.NONE); int docID = docsEnum.NextDoc(); Assert.IsTrue(docID != DocIdSetIterator.NO_MORE_DOCS); Assert.AreEqual(docIDToID.Get(docID), (int)termToID[expected]); @@ -904,25 +904,25 @@ namespace Lucene.Net.Index CompiledAutomaton ca = new CompiledAutomaton(automaton, false, false); TermsEnum te = terms.Intersect(ca, null); Assert.AreEqual("aaa", te.Next().Utf8ToString()); - Assert.AreEqual(0, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(0, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.AreEqual("bbb", te.Next().Utf8ToString()); - Assert.AreEqual(1, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(1, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.AreEqual("ccc", te.Next().Utf8ToString()); - Assert.AreEqual(2, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(2, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.IsNull(te.Next()); te = terms.Intersect(ca, new BytesRef("abc")); Assert.AreEqual("bbb", te.Next().Utf8ToString()); - Assert.AreEqual(1, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(1, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.AreEqual("ccc", te.Next().Utf8ToString()); - Assert.AreEqual(2, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(2, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.IsNull(te.Next()); te = terms.Intersect(ca, new BytesRef("aaa")); Assert.AreEqual("bbb", te.Next().Utf8ToString()); - Assert.AreEqual(1, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(1, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.AreEqual("ccc", te.Next().Utf8ToString()); - Assert.AreEqual(2, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(2, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.IsNull(te.Next()); r.Dispose(); @@ -966,17 +966,17 @@ namespace Lucene.Net.Index // should seek to startTerm te = terms.Intersect(ca, new BytesRef("aad")); Assert.AreEqual("abd", te.Next().Utf8ToString()); - Assert.AreEqual(1, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(1, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.AreEqual("acd", te.Next().Utf8ToString()); - Assert.AreEqual(2, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(2, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.AreEqual("bcd", te.Next().Utf8ToString()); - Assert.AreEqual(3, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(3, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.IsNull(te.Next()); // should fail to find ceil label on second arc, rewind te = terms.Intersect(ca, new BytesRef("add")); Assert.AreEqual("bcd", te.Next().Utf8ToString()); - Assert.AreEqual(3, te.Docs(null, null, DocsEnum.FLAG_NONE).NextDoc()); + Assert.AreEqual(3, te.Docs(null, null, DocsFlags.NONE).NextDoc()); Assert.IsNull(te.Next()); // should reach end @@ -1022,12 +1022,12 @@ namespace Lucene.Net.Index DocsEnum de; Assert.AreEqual("", te.Next().Utf8ToString()); - de = te.Docs(null, null, DocsEnum.FLAG_NONE); + de = te.Docs(null, null, DocsFlags.NONE); Assert.AreEqual(0, de.NextDoc()); Assert.AreEqual(1, de.NextDoc()); Assert.AreEqual("abc", te.Next().Utf8ToString()); - de = te.Docs(null, null, DocsEnum.FLAG_NONE); + de = te.Docs(null, null, DocsFlags.NONE); Assert.AreEqual(0, de.NextDoc()); Assert.AreEqual(1, de.NextDoc()); @@ -1037,7 +1037,7 @@ namespace Lucene.Net.Index te = terms.Intersect(ca, new BytesRef("")); Assert.AreEqual("abc", te.Next().Utf8ToString()); - de = te.Docs(null, null, DocsEnum.FLAG_NONE); + de = te.Docs(null, null, DocsFlags.NONE); Assert.AreEqual(0, de.NextDoc()); Assert.AreEqual(1, de.NextDoc());
