You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/08/12 13:20:47 UTC
[33/34] lucenenet git commit: Adding LUCENENET specific comments to
APIs that changed
Adding LUCENENET specific comments to APIs that changed
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/13fadeb7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/13fadeb7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/13fadeb7
Branch: refs/heads/lucenenet-indexablefield-api
Commit: 13fadeb78cad47c66b8b045bbc1e6405f0cf5c8e
Parents: 22caeb0
Author: Connie Yau <co...@microsoft.com>
Authored: Mon Aug 8 14:04:01 2016 -0700
Committer: Connie Yau <co...@microsoft.com>
Committed: Mon Aug 8 14:04:01 2016 -0700
----------------------------------------------------------------------
.../Analysis/BaseTokenStreamTestCase.cs | 28 ++++-
.../Codecs/lucene3x/PreFlexRWCodec.cs | 6 ++
.../Codecs/lucene40/Lucene40RWCodec.cs | 10 +-
.../lucene40/Lucene40RWDocValuesFormat.cs | 4 +
.../Codecs/lucene40/Lucene40RWNormsFormat.cs | 4 +
.../Codecs/lucene40/Lucene40RWPostingsFormat.cs | 4 +
.../Codecs/lucene41/Lucene41RWCodec.cs | 8 ++
.../Codecs/lucene42/Lucene42RWCodec.cs | 8 ++
.../lucene42/Lucene42RWDocValuesFormat.cs | 4 +
.../Codecs/lucene45/Lucene45RWCodec.cs | 8 ++
.../Index/RandomIndexWriter.cs | 27 +++--
.../Search/CheckHits.cs | 10 +-
.../Search/QueryUtils.cs | 22 +++-
.../Search/SearchEquivalenceTestBase.cs | 4 +
.../Util/LuceneTestCase.cs | 102 +++++++++++++++----
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 5 +-
.../Function/FunctionTestSetup.cs | 11 +-
.../Lucene3x/TestLucene3xStoredFieldsFormat.cs | 4 +
.../core/Codecs/Lucene3x/TestSurrogates.cs | 6 +-
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 6 +-
.../Lucene40/TestLucene40DocValuesFormat.cs | 4 +
.../Lucene40/TestLucene40PostingsFormat.cs | 4 +
.../Lucene40/TestLucene40PostingsReader.cs | 4 +
.../Lucene40/TestLucene40StoredFieldsFormat.cs | 4 +
.../Lucene40/TestLucene40TermVectorsFormat.cs | 4 +
.../core/Codecs/Lucene40/TestReuseDocsEnum.cs | 4 +
.../Lucene41/TestLucene41StoredFieldsFormat.cs | 4 +
.../Lucene42/TestLucene42DocValuesFormat.cs | 4 +
.../core/Index/TestBinaryDocValuesUpdates.cs | 5 +
.../core/Index/TestDirectoryReader.cs | 19 ++++
.../core/Index/TestDirectoryReaderReopen.cs | 4 +
.../core/Index/TestFieldsReader.cs | 4 +
.../core/Index/TestIndexWriter.cs | 2 -
.../core/Index/TestIndexWriterCommit.cs | 7 +-
.../core/Index/TestIndexWriterWithThreads.cs | 10 ++
.../core/Index/TestNeverDelete.cs | 10 ++
.../core/Index/TestRollingUpdates.cs | 5 +
.../core/Index/TestSnapshotDeletionPolicy.cs | 5 +
.../core/Index/TestStressIndexing.cs | 15 +++
.../core/Index/TestStressIndexing2.cs | 4 +
.../core/Search/BaseTestRangeFilter.cs | 10 ++
.../core/Search/FuzzyTermOnShortTermsTest.cs | 4 +
.../Search/Payloads/TestPayloadNearQuery.cs | 4 +
.../Search/Payloads/TestPayloadTermQuery.cs | 4 +
.../core/Search/Spans/TestBasics.cs | 4 +
.../Search/Spans/TestFieldMaskingSpanQuery.cs | 4 +
.../core/Search/Spans/TestSpansAdvanced.cs | 3 +
.../core/Search/TestBoolean2.cs | 4 +
.../core/Search/TestBooleanMinShouldMatch.cs | 4 +
.../core/Search/TestExplanations.cs | 5 +
.../core/Search/TestMinShouldMatch2.cs | 4 +
.../core/Search/TestMultiTermConstantScore.cs | 4 +
.../core/Search/TestMultiTermQueryRewrites.cs | 4 +
.../core/Search/TestNGramPhraseQuery.cs | 4 +
.../core/Search/TestNumericRangeQuery32.cs | 4 +
.../core/Search/TestNumericRangeQuery64.cs | 4 +
.../core/Search/TestPhraseQuery.cs | 2 +-
.../core/Search/TestPrefixInBooleanQuery.cs | 4 +
.../core/Search/TestTermVectors.cs | 4 +
59 files changed, 440 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
index 9253f7e..84ebc64 100644
--- a/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs
@@ -528,22 +528,37 @@ namespace Lucene.Net.Analysis
}
/// <summary>
- /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
+ /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy
+ ///
+ /// LUCENENET specific
+ /// Non-static to reduce the inter-class dependencies due to use of
+ /// static variables
+ /// </summary>
public void CheckRandomData(Random random, Analyzer a, int iterations)
{
CheckRandomData(random, a, iterations, 20, false, true);
}
/// <summary>
- /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
+ /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy
+ ///
+ /// LUCENENET specific
+ /// Non-static to reduce the inter-class dependencies due to use of
+ /// static variables
+ /// </summary>
public void CheckRandomData(Random random, Analyzer a, int iterations, int maxWordLength)
{
CheckRandomData(random, a, iterations, maxWordLength, false, true);
}
/// <summary>
- /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy </summary>
- /// <param name="simple"> true if only ascii strings will be used (try to avoid) </param>
+ /// utility method for blasting tokenstreams with data to make sure they don't do anything crazy
+ ///
+ /// LUCENENET specific
+ /// Non-static to reduce the inter-class dependencies due to use of
+ /// static variables
+ /// </summary>
+ /// <param name="simple"> true if only ascii strings will be used (try to avoid)</param>
public void CheckRandomData(Random random, Analyzer a, int iterations, bool simple)
{
CheckRandomData(random, a, iterations, 20, simple, true);
@@ -567,6 +582,11 @@ namespace Lucene.Net.Analysis
// interact)... so this is just "best effort":
public bool Failed;
+ /// <summary>
+ /// <param name="outerInstance">
+ /// LUCENENET specific
+ /// Added to remove a call to the then-static BaseTokenStreamTestCase methods</param>
+ /// </summary>
internal AnalysisThread(long seed, /*CountdownEvent latch,*/ Analyzer a, int iterations, int maxWordLength,
bool useCharFilter, bool simple, bool offsetsAreCorrect, RandomIndexWriter iw, BaseTokenStreamTestCase outerInstance)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
index a925737..51d1ef3 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene3x/PreFlexRWCodec.cs
@@ -33,6 +33,12 @@ namespace Lucene.Net.Codecs.Lucene3x
private readonly StoredFieldsFormat StoredFields = new PreFlexRWStoredFieldsFormat();
private readonly bool _oldFormatImpersonationIsActive;
+ /// <summary>
+ /// </summary>
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public PreFlexRWCodec(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
index 2e54359..bc39321 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWCodec.cs
@@ -24,7 +24,11 @@ namespace Lucene.Net.Codecs.Lucene40
public sealed class Lucene40RWCodec : Lucene40Codec
{
private readonly FieldInfosFormat fieldInfos;
-
+
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWCodec(bool oldFormatImpersonationIsActive) : base()
{
fieldInfos = new Lucene40FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
@@ -36,6 +40,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
index 2d47058..bbc2594 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWDocValuesFormat.cs
@@ -27,6 +27,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWDocValuesFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
index 5aaf248..3bce3b0 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWNormsFormat.cs
@@ -27,6 +27,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWNormsFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
index c6e6676..2a41c73 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40RWPostingsFormat.cs
@@ -27,6 +27,10 @@ namespace Lucene.Net.Codecs.Lucene40
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40RWPostingsFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
index ab5b775..1ab99be 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene41/Lucene41RWCodec.cs
@@ -34,6 +34,10 @@ namespace Lucene.Net.Codecs.Lucene41
private readonly NormsFormat Norms;
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene41RWCodec(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
@@ -47,6 +51,10 @@ namespace Lucene.Net.Codecs.Lucene41
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene40FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
index 93b192d..6263eb2 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWCodec.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene42
private readonly NormsFormat Norms = new Lucene42NormsFormat();
private readonly FieldInfosFormat fieldInfosFormat;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42RWCodec(bool oldFormatImpersonationIsActive) : base()
{
Dv = new Lucene42RWDocValuesFormat(oldFormatImpersonationIsActive);
@@ -38,6 +42,10 @@ namespace Lucene.Net.Codecs.Lucene42
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
index 5c00c98..de60523 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene42/Lucene42RWDocValuesFormat.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene42
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42RWDocValuesFormat(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs b/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
index 25c6571..f6c4722 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene45/Lucene45RWCodec.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene45
{
private readonly FieldInfosFormat fieldInfosFormat;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene45RWCodec(bool oldFormatImpersonationIsActive) : base()
{
fieldInfosFormat = new Lucene42FieldInfosFormatAnonymousInnerClassHelper(oldFormatImpersonationIsActive);
@@ -37,6 +41,10 @@ namespace Lucene.Net.Codecs.Lucene45
{
private readonly bool _oldFormatImpersonationIsActive;
+ /// <param name="oldFormatImpersonationIsActive">
+ /// LUCENENET specific
+ /// Added to remove dependency on then-static <see cref="LuceneTestCase.OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// </param>
public Lucene42FieldInfosFormatAnonymousInnerClassHelper(bool oldFormatImpersonationIsActive) : base()
{
_oldFormatImpersonationIsActive = oldFormatImpersonationIsActive;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
index b0d6b69..d1c1976 100644
--- a/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
+++ b/src/Lucene.Net.TestFramework/Index/RandomIndexWriter.cs
@@ -85,14 +85,28 @@ namespace Lucene.Net.Index
}
/// <summary>
- /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT and MockAnalyzer </summary>
+ /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT and MockAnalyzer
+ ///
+ /// LUCENENET specific
+ /// Similarity and TimeZone parameters allow a RandomIndexWriter to be
+ /// created without adding a dependency on
+ /// <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
+ /// <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
+ /// </summary>
public RandomIndexWriter(Random r, Directory dir, Similarity similarity, TimeZone timezone)
: this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, new MockAnalyzer(r), similarity, timezone))
{
}
/// <summary>
- /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT </summary>
+ /// create a RandomIndexWriter with a random config: Uses TEST_VERSION_CURRENT
+ ///
+ /// LUCENENET specific
+ /// Similarity and TimeZone parameters allow a RandomIndexWriter to be
+ /// created without adding a dependency on
+ /// <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
+ /// <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
+ /// </summary>
public RandomIndexWriter(Random r, Directory dir, Analyzer a, Similarity similarity, TimeZone timezone)
: this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, LuceneTestCase.TEST_VERSION_CURRENT, a, similarity, timezone))
{
@@ -100,11 +114,12 @@ namespace Lucene.Net.Index
/// <summary>
/// Creates a RandomIndexWriter with a random config
- ///
+ ///
/// LUCENENET specific
- /// This override allows a RandomIndexWriter to be created without
- /// adding a dependency on the LuceneTestCase.ClassEnv.Similarity and
- /// LuceneTestCase.ClassEnv.TimeZone property
+ /// Similarity and TimeZone parameters allow a RandomIndexWriter to be
+ /// created without adding a dependency on
+ /// <see cref="LuceneTestCase.ClassEnv.Similarity"/> and
+ /// <see cref="LuceneTestCase.ClassEnv.TimeZone"/>
/// </summary>
public RandomIndexWriter(Random r, Directory dir, LuceneVersion v, Analyzer a, Similarity similarity, TimeZone timezone)
: this(r, dir, LuceneTestCase.NewIndexWriterConfig(r, v, a, similarity, timezone))
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Search/CheckHits.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/CheckHits.cs b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
index f7c77aa..f58e6be 100644
--- a/src/Lucene.Net.TestFramework/Search/CheckHits.cs
+++ b/src/Lucene.Net.TestFramework/Search/CheckHits.cs
@@ -91,7 +91,11 @@ namespace Lucene.Net.Search
/// <param name="searcher"> the searcher to test the query against </param>
/// <param name="defaultFieldName"> used for displaying the query in assertion messages </param>
/// <param name="results"> a list of documentIds that must match the query </param>
- /// <seealso cref= #checkHits </seealso>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
+ /// <seealso cref=#checkHits </seealso>
public static void CheckHitCollector(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results, Similarity similarity)
{
QueryUtils.Check(random, query, searcher, similarity);
@@ -170,6 +174,10 @@ namespace Lucene.Net.Search
/// <param name="searcher"> the searcher to test the query against </param>
/// <param name="defaultFieldName"> used for displaing the query in assertion messages </param>
/// <param name="results"> a list of documentIds that must match the query </param>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
/// <seealso cref= #checkHitCollector </seealso>
public static void DoCheckHits(Random random, Query query, string defaultFieldName, IndexSearcher searcher, int[] results, Similarity similarity)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
index 88ff11d..cc83440 100644
--- a/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
+++ b/src/Lucene.Net.TestFramework/Search/QueryUtils.cs
@@ -118,6 +118,10 @@ namespace Lucene.Net.Search
/// Various query sanity checks on a searcher, some checks are only done for
/// instanceof IndexSearcher.
/// </summary>
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
/// <seealso cref= #check(Query) </seealso>
/// <seealso cref= #checkFirstSkipTo </seealso>
/// <seealso cref= #checkSkipTo </seealso>
@@ -128,6 +132,10 @@ namespace Lucene.Net.Search
Check(random, q1, s, true, similarity);
}
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static void Check(Random random, Query q1, IndexSearcher s, bool wrap, Similarity similarity)
{
try
@@ -200,6 +208,10 @@ namespace Lucene.Net.Search
/// behave exactly the same as the original IndexSearcher. </summary>
/// <param name="s"> the searcher to wrap </param>
/// <param name="edge"> if negative, s will be the first sub; if 0, s will be in the middle, if positive s will be the last sub </param>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher WrapUnderlyingReader(Random random, IndexSearcher s, int edge, Similarity similarity)
{
IndexReader r = s.IndexReader;
@@ -251,6 +263,10 @@ namespace Lucene.Net.Search
/// alternate scorer skipTo(),skipTo(),next(),next(),skipTo(),skipTo(), etc
/// and ensure a hitcollector receives same docs and scores
/// </summary>
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static void CheckSkipTo(Query q, IndexSearcher s, Similarity similarity)
{
//System.out.println("Checking "+q);
@@ -412,7 +428,11 @@ namespace Lucene.Net.Search
}
/// <summary>
- /// check that first skip on just created scorers always goes to the right doc </summary>
+ /// check that first skip on just created scorers always goes to the right doc</summary>
+ /// <param name = "similarity" >
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static void CheckFirstSkipTo(Query q, IndexSearcher s, Similarity similarity)
{
//System.out.println("checkFirstSkipTo: "+q);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
index 19a182c..ba5f663 100644
--- a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
@@ -57,6 +57,10 @@ namespace Lucene.Net.Search
protected internal static Analyzer Analyzer;
protected internal static string Stopword; // we always pick a character as a stopword
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because ClassEnvRule is no longer static.
+ /// </summary>
[SetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index ac143ba..9f95259 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -423,6 +423,9 @@ namespace Lucene.Net.Util
/// specific tests on demand.
///
/// @lucene.internal
+ ///
+ /// LUCENENET specific
+ /// Is non-static to remove inter-class dependencies on this variable
/// </summary>
public bool OLD_FORMAT_IMPERSONATION_IS_ACTIVE { get; protected set; }
@@ -437,16 +440,27 @@ namespace Lucene.Net.Util
/// <summary>
/// Class environment setup rule.
+ ///
+ /// LUCENENET specific
+ /// Is non-static to remove inter-class dependencies on this variable
/// </summary>
internal TestRuleSetupAndRestoreClassEnv ClassEnvRule { get; private set; }
/// <summary>
/// Gets the Similarity from the Class Environment setup rule
+ ///
+ /// LUCENENET specific
+ /// Exposed because <see cref="TestRuleSetupAndRestoreClassEnv"/> is
+ /// internal and this field is needed by other classes.
/// </summary>
public Similarity Similarity { get { return ClassEnvRule.Similarity; } }
/// <summary>
/// Gets the Timezone from the Class Environment setup rule
+ ///
+ /// LUCENENET specific
+ /// Exposed because <see cref="TestRuleSetupAndRestoreClassEnv"/> is
+ /// internal and this field is needed by other classes.
/// </summary>
public TimeZone TimeZone { get { return ClassEnvRule.TimeZone; } }
@@ -851,19 +865,32 @@ namespace Lucene.Net.Util
}
/// <summary>
- /// create a new index writer config with random defaults </summary>
+ /// create a new index writer config with random defaults
+ ///
+ /// LUCENENET specific
+ /// Non-static so that we do not depend on any hidden static dependencies
+ /// </summary>
public IndexWriterConfig NewIndexWriterConfig(LuceneVersion v, Analyzer a)
{
return NewIndexWriterConfig(Random(), v, a);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Non-static so that we do not depend on any hidden static dependencies
+ /// </summary>
public IndexWriterConfig NewIndexWriterConfig(Random r, LuceneVersion v, Analyzer a)
{
return NewIndexWriterConfig(r, v, a, ClassEnvRule.Similarity, ClassEnvRule.TimeZone);
}
/// <summary>
- /// create a new index writer config with random defaults using the specified random </summary>
+ /// create a new index writer config with random defaults using the specified random
+ ///
+ /// LUCENENET specific
+ /// This is the only static ctor for IndexWriterConfig because it removes the dependency
+ /// on ClassEnvRule by using parameters Similarity and TimeZone.
+ /// </summary>
public static IndexWriterConfig NewIndexWriterConfig(Random r, LuceneVersion v, Analyzer a, Similarity similarity, TimeZone timezone)
{
IndexWriterConfig c = new IndexWriterConfig(v, a);
@@ -963,24 +990,10 @@ namespace Lucene.Net.Util
return c;
}
- /// <summary>
- /// Gets an IndexWriterConfig using the current TEST_LUCENE_VERSION and a MockAnalyzer
- /// </summary>
- public IndexWriterConfig NewIndexWriterConfig()
- {
- var random = Random();
-
- return NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random));
- }
-
- /// <summary>
- /// Gets an IndexWriterConfig using the current TEST_LUCENE_VERSION and the given analyzer
- /// </summary>
- public IndexWriterConfig NewIndexWriterConfig(Analyzer a)
- {
- return NewIndexWriterConfig(Random(), TEST_VERSION_CURRENT, a);
- }
-
+ /// <param name="timezone">
+ /// LUCENENET specific
+ /// Timezone added to remove dependency on the then-static <see cref="ClassEnvRule"/>
+ /// </param>
public static MergePolicy NewMergePolicy(Random r, TimeZone timezone)
{
if (Rarely(r))
@@ -998,6 +1011,10 @@ namespace Lucene.Net.Util
return NewLogMergePolicy(r);
}
+ /// <param name="timezone">
+ /// LUCENENET specific
+ /// Timezone added to remove dependency on the then-static <see cref="ClassEnvRule"/>
+ /// </param>
public static MergePolicy NewMergePolicy(TimeZone timezone)
{
return NewMergePolicy(Random(), timezone);
@@ -1277,31 +1294,61 @@ namespace Lucene.Net.Util
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewStringField(string name, string value, Field.Store stored)
{
return NewField(Random(), name, value, stored == Field.Store.YES ? StringField.TYPE_STORED : StringField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewTextField(string name, string value, Field.Store stored)
{
return NewField(Random(), name, value, stored == Field.Store.YES ? TextField.TYPE_STORED : TextField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewStringField(Random random, string name, string value, Field.Store stored)
{
return NewField(random, name, value, stored == Field.Store.YES ? StringField.TYPE_STORED : StringField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is also non-static to reduce hidden dependencies on this variable.
+ /// </summary>
public Field NewTextField(Random random, string name, string value, Field.Store stored)
{
return NewField(random, name, value, stored == Field.Store.YES ? TextField.TYPE_STORED : TextField.TYPE_NOT_STORED);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewField(string name, string value, FieldType type)
{
return NewField(Random(), name, value, type);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="OLD_FORMAT_IMPERSONATION_IS_ACTIVE"/>
+ /// is now non-static.
+ /// </summary>
public Field NewField(Random random, string name, string value, FieldType type)
{
name = new string(name.ToCharArray());
@@ -1577,12 +1624,19 @@ namespace Lucene.Net.Util
/// <summary>
/// Create a new searcher over the reader. this searcher might randomly use
/// threads.
+ ///
+ /// LUCENENET specific
+ /// Is non-static because <see cref="ClassEnvRule"/> is now non-static.
/// </summary>
public IndexSearcher NewSearcher(IndexReader r)
{
return NewSearcher(r, ClassEnvRule.Similarity);
}
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher NewSearcher(IndexReader r, Similarity similarity)
{
return NewSearcher(r, true, similarity);
@@ -1592,6 +1646,10 @@ namespace Lucene.Net.Util
/// Create a new searcher over the reader. this searcher might randomly use
/// threads.
/// </summary>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, Similarity similarity)
{
return NewSearcher(r, maybeWrap, true, similarity);
@@ -1609,6 +1667,10 @@ namespace Lucene.Net.Util
/// <code>wrapWithAssertions</code> is true, this searcher might be an
/// <seealso cref="AssertingIndexSearcher"/> instance.
/// </summary>
+ /// <param name="similarity">
+ /// LUCENENET specific
+ /// Removes dependency on <see cref="LuceneTestCase.ClassEnv.Similarity"/>
+ /// </param>
public static IndexSearcher NewSearcher(IndexReader r, bool maybeWrap, bool wrapWithAssertions, Similarity similarity)
{
Random random = Random();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index 2df9d52..b4bc17b 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -45,7 +45,10 @@ namespace Lucene.Net.Facet.Taxonomy
private static FacetsConfig config;
-
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
index a94231c..896a504 100644
--- a/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
+++ b/src/Lucene.Net.Tests.Queries/Function/FunctionTestSetup.cs
@@ -65,7 +65,10 @@ namespace Lucene.Net.Tests.Queries.Function
anlzr = null;
}
-
+ /// <summary>
+ /// LUCENENET specific
+ /// Non-static because NewIndexWriterConfig is now non-static
+ /// </summary>
protected internal void CreateIndex(bool doMultiSegment)
{
if (VERBOSE)
@@ -110,7 +113,11 @@ namespace Lucene.Net.Tests.Queries.Function
Console.WriteLine("TEST: setUp done close");
}
}
-
+
+ /// <summary>
+ /// LUCENENET specific
+ /// Non-static because NewField is now non-static
+ /// </summary>
private void AddDoc(RandomIndexWriter iw, int i)
{
Document d = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
index f323e3a..b28f86a 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
@@ -25,6 +25,10 @@ namespace Lucene.Net.Codecs.Lucene3x
[TestFixture]
public class TestLucene3xStoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
index ad96e0d..256eae2 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -33,7 +33,11 @@ namespace Lucene.Net.Codecs.Lucene3x
public class TestSurrogates : LuceneTestCase
{
/// <summary>
- /// we will manually instantiate preflex-rw here </summary>
+ /// we will manually instantiate preflex-rw here
+ ///
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index 3927927..227e22b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -64,7 +64,11 @@ namespace Lucene.Net.Codecs.Lucene3x
private static IList<Term> SampleTerms;
/// <summary>
- /// we will manually instantiate preflex-rw here </summary>
+ /// we will manually instantiate preflex-rw here
+ ///
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
index 86a0bde..813c638 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -26,6 +26,10 @@ namespace Lucene.Net.Codecs.Lucene40
/// </summary>
public class TestLucene40DocValuesFormat : BaseDocValuesFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
index b418edf..c7f7f07 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
@@ -26,6 +26,10 @@ namespace Lucene.Net.Codecs.Lucene40
/// </summary>
public class TestLucene40PostingsFormat : BasePostingsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
index 793fc3a..73852cd 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
@@ -53,6 +53,10 @@ namespace Lucene.Net.Codecs.Lucene40
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
index ee4e582..4e57234 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
@@ -23,6 +23,10 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40StoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
index a512f67..342d7ce 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
@@ -23,6 +23,10 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40TermVectorsFormat : BaseTermVectorsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
index 29efae2..c335b8c 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -46,6 +46,10 @@ namespace Lucene.Net.Codecs.Lucene40
[TestFixture]
public class TestReuseDocsEnum : LuceneTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
index 4f55ac2..4259478 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -23,6 +23,10 @@ namespace Lucene.Net.Codecs.Lucene41
public class TestLucene41StoredFieldsFormat : BaseStoredFieldsFormatTestCase
{
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
index 417b29b..4cf9c73 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -28,6 +28,10 @@ namespace Lucene.Net.Codecs.Lucene42
{
private Codec Codec_Renamed;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
index eadd065..9c89305 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBinaryDocValuesUpdates.cs
@@ -1131,6 +1131,11 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Split from <see cref="TestUpdateOldSegments"/> because OLD_FORMAT_IMPERSONATION_IS_ACTIVE
+ /// is no longer static and the existing codecs have to be remade.
+ /// </summary>
[Test]
public virtual void TestUpdateOldSegments_OldFormatNotActive()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index 2de7c4d..f5bc803 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -497,6 +497,11 @@ namespace Lucene.Net.Index
dir.Dispose();
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewStringField, NewTextField, NewField methods
+ /// are no longer static.
+ /// </summary>
internal void AddDocumentWithFields(IndexWriter writer)
{
Document doc = new Document();
@@ -510,6 +515,11 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewStringField, NewTextField, NewField methods
+ /// are no longer static.
+ /// </summary>
internal void AddDocumentWithDifferentFields(IndexWriter writer)
{
Document doc = new Document();
@@ -523,6 +533,11 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewTextField, NewField methods are no longer
+ /// static.
+ /// </summary>
internal void AddDocumentWithTermVectorFields(IndexWriter writer)
{
Document doc = new Document();
@@ -547,6 +562,10 @@ namespace Lucene.Net.Index
writer.AddDocument(doc);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewTextField is no longer static.
+ /// </summary>
internal void AddDoc(IndexWriter writer, string value)
{
Document doc = new Document();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
index 95dcfa9..bb47a09 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReaderReopen.cs
@@ -559,6 +559,10 @@ namespace Lucene.Net.Index
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
public void CreateIndex(Random random, Directory dir, bool multiSegment)
{
IndexWriter.Unlock(dir);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
index 0ec38fe..49933a7 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -45,6 +45,10 @@ namespace Lucene.Net.Index
private static Document TestDoc;
private static FieldInfos.Builder FieldInfos = null;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
index 02317d0..fd030d1 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriter.cs
@@ -147,7 +147,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Changed from internal static method to private to remove
/// inter-dependencies between TestIndexWriter*.cs, TestAddIndexes.cs
/// and TestDeletionPolicy.cs tests
@@ -161,7 +160,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Changed from internal static method to private to remove
/// inter-dependencies between TestIndexWriter*.cs, TestAddIndexes.cs
/// and TestDeletionPolicy.cs tests
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
index b2b6eda..af25a0a 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterCommit.cs
@@ -393,6 +393,11 @@ namespace Lucene.Net.Index
private long EndTime;
private int FinalI;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// This is passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
public ThreadAnonymousInnerClassHelper(Directory dir, RandomIndexWriter w, AtomicBoolean failed, long endTime, int finalI, Func<string, string, Field.Store, Field> newStringField)
{
NewStringField = newStringField;
@@ -739,7 +744,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Copied from <see cref="TestIndexWriter.AddDoc(IndexWriter)"/>
/// to remove inter-class dependency on <see cref="TestIndexWriter"/>
/// </summary>
@@ -752,7 +756,6 @@ namespace Lucene.Net.Index
/// <summary>
/// LUCENENET specific
- ///
/// Copied from <seealso cref="TestIndexWriter.AddDocWithIndex(IndexWriter, int)"/>
/// to remove inter-class dependency on <see cref="TestIndexWriter"/>.
/// </summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
index d983d88..e80286e 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexWriterWithThreads.cs
@@ -65,6 +65,11 @@ namespace Lucene.Net.Index
internal bool NoErrors;
internal volatile int AddCount;
+ /// <param name="newField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewField(string, string, FieldType)"/>
+ /// is no longer static.
+ /// </param>
public IndexerThread(IndexWriter writer, bool noErrors, Func<string, string, FieldType, Field> newField)
{
this.Writer = writer;
@@ -602,6 +607,11 @@ namespace Lucene.Net.Index
internal CountdownEvent IwConstructed;
private readonly LuceneTestCase OuterInstance;
+ /// <param name="outerInstance">
+ /// LUCENENET specific
+ /// Passed in because this class acceses non-static methods,
+ /// NewTextField and NewIndexWriterConfig
+ /// </param>
public DelayedIndexAndCloseRunnable(Directory dir, CountdownEvent iwConstructed, LuceneTestCase outerInstance)
{
this.Dir = dir;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs b/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
index 74db3bb..572182c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNeverDelete.cs
@@ -110,6 +110,16 @@ namespace Lucene.Net.Index
private RandomIndexWriter w;
private long StopTime;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static
+ /// </param>
+ /// <param name="newTextField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewTextField(string, string, Field.Store)"/>
+ /// is no longer static
+ /// </param>
public ThreadAnonymousInnerClassHelper(RandomIndexWriter w, long stopTime,
Func<string, string, Field.Store, Field> newStringField, Func<string, string, Field.Store, Field> newTextField)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
index 804822c..c3764da 100644
--- a/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestRollingUpdates.cs
@@ -231,6 +231,11 @@ namespace Lucene.Net.Index
private readonly Func<string, string, Field.Store, Field> NewStringField;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
public IndexingThread(LineFileDocs docs, IndexWriter writer, int num, Func<string, string, Field.Store, Field> newStringField)
: base()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
index 682e1cc..bc071b2 100644
--- a/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestSnapshotDeletionPolicy.cs
@@ -185,6 +185,11 @@ namespace Lucene.Net.Index
private IndexWriter Writer;
private readonly Func<string, string, FieldType, Field> _newFieldFunc;
+ /// <param name="newFieldFunc">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewField(string, string, FieldType)"/>
+ /// is no longer static.
+ /// </param>
public ThreadAnonymousInnerClassHelper(long stopTime, IndexWriter writer, Func<string, string, FieldType, Field> newFieldFunc)
{
this.StopTime = stopTime;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
index 48dbbff..d97ee79 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing.cs
@@ -95,6 +95,16 @@ namespace Lucene.Net.Index
internal IndexWriter Writer;
internal int NextID;
+ /// <param name="newStringField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewStringField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
+ /// <param name="newTextField">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewTextField(string, string, Field.Store)"/>
+ /// is no longer static.
+ /// </param>
public IndexerThread(IndexWriter writer, TimedThread[] threads,
Func<string, string, Field.Store, Field> newStringField,
Func<string, string, Field.Store, Field> newTextField)
@@ -132,6 +142,11 @@ namespace Lucene.Net.Index
internal Directory Directory;
private readonly LuceneTestCase OuterInstance;
+ /// <param name="outerInstance">
+ /// LUCENENET specific
+ /// Passed in because <see cref="LuceneTestCase.NewSearcher(IndexReader)"/>
+ /// is no longer static.
+ /// </param>
public SearcherThread(Directory directory, TimedThread[] threads, LuceneTestCase outerInstance)
: base(threads)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
index 2275402..d35cdd9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStressIndexing2.cs
@@ -272,6 +272,10 @@ namespace Lucene.Net.Index
return docs;
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
public void IndexSerial(Random random, IDictionary<string, Document> docs, Directory dir)
{
IndexWriter w = new IndexWriter(dir, NewIndexWriterConfig(random, TEST_VERSION_CURRENT, new MockAnalyzer(random)).SetMergePolicy(NewLogMergePolicy()));
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
index 29ef55e..96ec2f4 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -95,6 +95,11 @@ namespace Lucene.Net.Search
return b.ToString();
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because <see cref="Build(Random, TestIndex)"/> is no
+ /// longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClassBaseTestRangeFilter()
{
@@ -118,6 +123,11 @@ namespace Lucene.Net.Search
UnsignedIndexDir = null;
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Passed in because NewStringField and NewIndexWriterConfig are no
+ /// longer static.
+ /// </summary>
private IndexReader Build(Random random, TestIndex index)
{
/* build an index */
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs b/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
index a6678f6..19c91b4 100644
--- a/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
+++ b/src/Lucene.Net.Tests/core/Search/FuzzyTermOnShortTermsTest.cs
@@ -96,6 +96,10 @@ namespace Lucene.Net.Search
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
public Directory GetDirectory(Analyzer analyzer, string[] vals)
{
Directory directory = NewDirectory();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
index 7b756ce..9da6e81 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -110,6 +110,10 @@ namespace Lucene.Net.Search.Payloads
return new PayloadNearQuery(clauses, 0, inOrder, function);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
index 7a1e1cd..b44ffd4 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -115,6 +115,10 @@ namespace Lucene.Net.Search.Payloads
}
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
index bbe41ed..34529d8 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -93,6 +93,10 @@ namespace Lucene.Net.Search.Spans
internal static Analyzer SimplePayloadAnalyzer;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
index bb71d97..e8ab517 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -54,6 +54,10 @@ namespace Lucene.Net.Search.Spans
protected internal static Directory Directory;
protected internal static IndexReader Reader;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
index 859ca20..cfdca01 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpansAdvanced.cs
@@ -123,6 +123,9 @@ namespace Lucene.Net.Search.Spans
/// <summary>
/// Checks to see if the hits are what we expected.
+ ///
+ /// LUCENENET specific
+ /// Is non-static because it depends on the non-static variable, <see cref="LuceneTestCase.Similarity"/>
/// </summary>
/// <param name="query"> the query to execute </param>
/// <param name="description"> the description of the search </param>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
index 7ba20e3..bf571a5 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -57,6 +57,10 @@ namespace Lucene.Net.Search
private static Directory Dir2;
private static int MulFactor;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
index fca1ddd..882b740 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -44,6 +44,10 @@ namespace Lucene.Net.Search
private static IndexReader r;
private static IndexSearcher s;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewStringField is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
index 50e6e70..a528615 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -73,6 +73,11 @@ namespace Lucene.Net.Search
Directory = null;
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig, NewTextField and
+ /// NewStringField are no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClassTestExplanations()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
index 33aec6e..eab721a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -60,6 +60,10 @@ namespace Lucene.Net.Search
internal static readonly string[] MediumTerms = new string[] { "e", "f", "g" };
internal static readonly string[] RareTerms = new string[] { "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z" };
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
index 60105a1..5ae1761 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -50,6 +50,10 @@ namespace Lucene.Net.Search
Assert.AreEqual(e, a, m);
}
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
index 0705a83..2449b89 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -45,6 +45,10 @@ namespace Lucene.Net.Search
internal static IndexReader Reader, MultiReader, MultiReaderDupls;
internal static IndexSearcher Searcher, MultiSearcher, MultiSearcherDupls;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
index 3db7193..f6756c2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -32,6 +32,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader;
private static Directory Directory;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
index 8c26b24..c62d041 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -61,6 +61,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader = null;
private static IndexSearcher Searcher = null;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
index d55bd45..de7b10f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -61,6 +61,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader = null;
private static IndexSearcher Searcher = null;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index 1f7a96c..9c037e8 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -255,7 +255,7 @@ namespace Lucene.Net.Search
query.Add(new Term("field", "words"));
ScoreDoc[] hits = searcher.Search(query, null, 1000).ScoreDocs;
Assert.AreEqual(1, hits.Length);
- QueryUtils.Check(Random(), query, Searcher, Similarity);
+ QueryUtils.Check(Random(), query, searcher, Similarity);
reader.Dispose();
directory.Dispose();
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index 99b40e6..22be01c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -46,6 +46,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader;
private static IndexSearcher Searcher;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because Similarity and TimeZone are not static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13fadeb7/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
index bdb76fd..d2a5126 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -47,6 +47,10 @@ namespace Lucene.Net.Search
private static IndexReader Reader;
private static Directory Directory;
+ /// <summary>
+ /// LUCENENET specific
+ /// Is non-static because NewIndexWriterConfig is no longer static.
+ /// </summary>
[TestFixtureSetUp]
public void BeforeClass()
{