Skip to content

Commit

Permalink
Formatting and remove extraneous comment in Search/Payloads, apache#259
Browse files Browse the repository at this point in the history
  • Loading branch information
paulirwin committed Jan 22, 2024
1 parent 3729f4c commit 68d21e5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 23 deletions.
4 changes: 2 additions & 2 deletions src/Lucene.Net.Tests/Search/Payloads/PayloadHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public virtual IndexSearcher SetUp(Random random, Similarity similarity, int num
PayloadAnalyzer analyzer = new PayloadAnalyzer(this);

// TODO randomize this
IndexWriter writer = new IndexWriter(directory, (new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, analyzer)).SetSimilarity(similarity));
IndexWriter writer = new IndexWriter(directory, new IndexWriterConfig(LuceneTestCase.TEST_VERSION_CURRENT, analyzer).SetSimilarity(similarity));
// writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++)
{
Expand All @@ -156,4 +156,4 @@ public virtual void TearDown()
Reader.Dispose();
}
}
}
}
11 changes: 2 additions & 9 deletions src/Lucene.Net.Tests/Search/Payloads/TestPayloadExplanations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,11 @@ public class TestPayloadExplanations : TestExplanations
public override void SetUp()
{
base.SetUp();
searcher.Similarity = new DefaultSimilarityAnonymousClass(this);
searcher.Similarity = new DefaultSimilarityAnonymousClass();
}

private sealed class DefaultSimilarityAnonymousClass : DefaultSimilarity
{
private readonly TestPayloadExplanations outerInstance;

public DefaultSimilarityAnonymousClass(TestPayloadExplanations outerInstance)
{
this.outerInstance = outerInstance;
}

public override float ScorePayload(int doc, int start, int end, BytesRef payload)
{
return 1 + (payload.GetHashCode() % 10);
Expand Down Expand Up @@ -118,4 +111,4 @@ public virtual void TestPT5()

// TODO: test the payloadnear query too!
}
}
}
10 changes: 4 additions & 6 deletions src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,15 @@ private PayloadNearQuery NewPhraseQuery(string fieldName, string phrase, bool in
return new PayloadNearQuery(clauses, 0, inOrder, function);
}

/// <summary>
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
[OneTimeSetUp]
public override void BeforeClass()
{
base.BeforeClass();

directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random, directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(similarity));
RandomIndexWriter writer = new RandomIndexWriter(Random, directory,
NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
.SetSimilarity(similarity));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++)
{
Expand Down Expand Up @@ -396,4 +394,4 @@ public override Explanation IdfExplain(CollectionStatistics collectionStats, Ter
}
}
}
}
}
10 changes: 4 additions & 6 deletions src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,15 @@ public override void Reset()
}
}

/// <summary>
/// LUCENENET specific
/// Is non-static because NewIndexWriterConfig is no longer static.
/// </summary>
[OneTimeSetUp]
public override void BeforeClass()
{
base.BeforeClass();

directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random, directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).SetSimilarity(similarity).SetMergePolicy(NewLogMergePolicy()));
RandomIndexWriter writer = new RandomIndexWriter(Random, directory,
NewIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
.SetSimilarity(similarity).SetMergePolicy(NewLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++)
{
Expand Down Expand Up @@ -370,4 +368,4 @@ public virtual float ScorePayload(int docId, string fieldName, sbyte[] payload,
}
}
}
}
}

0 comments on commit 68d21e5

Please sign in to comment.