You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/07/20 21:49:28 UTC
[7/8] lucenenet git commit:
Lucene.Net.Tests.Querys.CommonTermsQueryTest: Added missing TestRandomIndex()
test
Lucene.Net.Tests.Querys.CommonTermsQueryTest: Added missing TestRandomIndex() test
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/81a45650
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/81a45650
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/81a45650
Branch: refs/heads/master
Commit: 81a4565042b01ab413477b6db0cb277311128e82
Parents: d71d1a0
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Fri Jul 21 04:37:57 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Fri Jul 21 04:37:57 2017 +0700
----------------------------------------------------------------------
.../CommonTermsQueryTest.cs | 46 ++++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/81a45650/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
index e4476ef..fc80980 100644
--- a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
+++ b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
@@ -384,52 +384,50 @@ namespace Lucene.Net.Tests.Queries
dir.Dispose();
}
- /*
- * LUCENENET TODO requires a better comparer implementation for PriorityQueue
[Test]
public void TestRandomIndex()
{
Directory dir = NewDirectory();
MockAnalyzer analyzer = new MockAnalyzer(Random());
analyzer.MaxTokenLength = TestUtil.NextInt(Random(), 1, IndexWriter.MAX_TERM_LENGTH);
- RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+ RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer, Similarity, TimeZone);
CreateRandomIndex(AtLeast(50), w, Random().NextLong());
DirectoryReader reader = w.Reader;
AtomicReader wrapper = SlowCompositeReaderWrapper.Wrap(reader);
string field = @"body";
- Terms terms = wrapper.Terms(field);
+ Terms terms = wrapper.GetTerms(field);
var lowFreqQueue = new AnonymousPriorityQueue(this, 5);
Util.PriorityQueue<TermAndFreq> highFreqQueue = new AnonymousPriorityQueue1(this, 5);
try
{
- TermsEnum iterator = terms.Iterator(null);
+ TermsEnum iterator = terms.GetIterator(null);
while (iterator.Next() != null)
{
- if (highFreqQueue.Size() < 5)
+ if (highFreqQueue.Count < 5)
{
- highFreqQueue.Add(new TermAndFreq(BytesRef.DeepCopyOf(iterator.Term()), iterator.DocFreq()));
- lowFreqQueue.Add(new TermAndFreq(BytesRef.DeepCopyOf(iterator.Term()), iterator.DocFreq()));
+ highFreqQueue.Add(new TermAndFreq(BytesRef.DeepCopyOf(iterator.Term), iterator.DocFreq));
+ lowFreqQueue.Add(new TermAndFreq(BytesRef.DeepCopyOf(iterator.Term), iterator.DocFreq));
}
else
{
- if (highFreqQueue.Top().freq < iterator.DocFreq())
+ if (highFreqQueue.Top.freq < iterator.DocFreq)
{
- highFreqQueue.Top().freq = iterator.DocFreq();
- highFreqQueue.Top().term = BytesRef.DeepCopyOf(iterator.Term());
+ highFreqQueue.Top.freq = iterator.DocFreq;
+ highFreqQueue.Top.term = BytesRef.DeepCopyOf(iterator.Term);
highFreqQueue.UpdateTop();
}
- if (lowFreqQueue.Top().freq > iterator.DocFreq())
+ if (lowFreqQueue.Top.freq > iterator.DocFreq)
{
- lowFreqQueue.Top().freq = iterator.DocFreq();
- lowFreqQueue.Top().term = BytesRef.DeepCopyOf(iterator.Term());
+ lowFreqQueue.Top.freq = iterator.DocFreq;
+ lowFreqQueue.Top.term = BytesRef.DeepCopyOf(iterator.Term);
lowFreqQueue.UpdateTop();
}
}
}
- int lowFreq = lowFreqQueue.Top().freq;
- int highFreq = highFreqQueue.Top().freq;
+ int lowFreq = lowFreqQueue.Top.freq;
+ int highFreq = highFreqQueue.Top.freq;
AssumeTrue(@"unlucky index", highFreq - 1 > lowFreq);
List<TermAndFreq> highTerms = QueueToList(highFreqQueue);
List<TermAndFreq> lowTerms = QueueToList(lowFreqQueue);
@@ -462,10 +460,10 @@ namespace Lucene.Net.Tests.Queries
assertTrue(hits.Remove(doc.Doc));
}
- assertTrue(hits.IsEmpty());
+ assertTrue(hits.Count == 0);
w.ForceMerge(1);
DirectoryReader reader2 = w.Reader;
- QueryUtils.Check(Random(), cq, NewSearcher(reader2));
+ QueryUtils.Check(Random(), cq, NewSearcher(reader2), Similarity);
reader2.Dispose();
}
finally
@@ -477,9 +475,10 @@ namespace Lucene.Net.Tests.Queries
}
}
- private sealed class AnonymousPriorityQueue : Support.PriorityQueue<TermAndFreq>
+ private sealed class AnonymousPriorityQueue : Util.PriorityQueue<TermAndFreq>
{
- public AnonymousPriorityQueue(CommonTermsQueryTest parent)
+ public AnonymousPriorityQueue(CommonTermsQueryTest parent, int maxSize)
+ : base(maxSize)
{
this.parent = parent;
}
@@ -491,9 +490,10 @@ namespace Lucene.Net.Tests.Queries
}
}
- private sealed class AnonymousPriorityQueue1 : Support.PriorityQueue<TermAndFreq>
+ private sealed class AnonymousPriorityQueue1 : Util.PriorityQueue<TermAndFreq>
{
- public AnonymousPriorityQueue1(CommonTermsQueryTest parent)
+ public AnonymousPriorityQueue1(CommonTermsQueryTest parent, int maxSize)
+ : base(maxSize)
{
this.parent = parent;
}
@@ -503,7 +503,7 @@ namespace Lucene.Net.Tests.Queries
{
return a.freq < b.freq;
}
- }*/
+ }
private static List<TermAndFreq> QueueToList(Util.PriorityQueue<TermAndFreq> queue)
{