This is an automated email from the ASF dual-hosted git repository.
paulirwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
The following commit(s) were added to refs/heads/master by this push:
new abe75de14 SWEEP: Rename BeforeClass/AfterClass to
OneTimeSetUp/OneTimeTearDown, #1016 (#1051)
abe75de14 is described below
commit abe75de14adb010fd4ac2b614cf5af2b8157e22b
Author: Paul Irwin <[email protected]>
AuthorDate: Wed Nov 27 08:36:27 2024 -0700
SWEEP: Rename BeforeClass/AfterClass to OneTimeSetUp/OneTimeTearDown, #1016
(#1051)
* Rename BeforeClass to OneTimeSetUp, #1016
* Rename AfterClass to OneTimeTearDown, #1016
* Remove unnecessary comments; Fix docs in LuceneTestCase w/r/t
setup/teardown
---
.../Index/BasePostingsFormatTestCase.cs | 80 +++++++++++-----------
.../Index/BaseTermVectorsFormatTestCase.cs | 4 +-
.../Search/SearchEquivalenceTestBase.cs | 8 +--
.../Configuration/ConfigurationSettingTestCase.cs | 4 +-
.../Support/Util/LuceneTestFrameworkInitializer.cs | 2 +-
.../Util/LuceneTestCase.cs | 24 ++++---
.../Analysis/Core/TestRandomChains.cs | 22 +++---
.../Analysis/Hunspell/TestAlternateCasing.cs | 4 +-
.../Analysis/Hunspell/TestCaseInsensitive.cs | 6 +-
.../Analysis/Hunspell/TestCaseSensitive.cs | 4 +-
.../Analysis/Hunspell/TestCircumfix.cs | 6 +-
.../Analysis/Hunspell/TestComplexPrefix.cs | 6 +-
.../Analysis/Hunspell/TestCondition.cs | 6 +-
.../Analysis/Hunspell/TestCondition2.cs | 4 +-
.../Analysis/Hunspell/TestConditionGH418.cs | 4 +-
.../Analysis/Hunspell/TestConv.cs | 6 +-
.../Analysis/Hunspell/TestDependencies.cs | 7 +-
.../Analysis/Hunspell/TestDoubleEscape.cs | 4 +-
.../Analysis/Hunspell/TestEscaped.cs | 7 +-
.../Analysis/Hunspell/TestFlagLong.cs | 7 +-
.../Analysis/Hunspell/TestFlagNum.cs | 7 +-
.../Analysis/Hunspell/TestFullStrip.cs | 4 +-
.../Analysis/Hunspell/TestHomonyms.cs | 8 +--
.../Analysis/Hunspell/TestHunspellStemFilter.cs | 10 +--
.../Analysis/Hunspell/TestIgnore.cs | 8 +--
.../Analysis/Hunspell/TestKeepCase.cs | 4 +-
.../Analysis/Hunspell/TestMorph.cs | 8 +--
.../Analysis/Hunspell/TestMorphAlias.cs | 4 +-
.../Analysis/Hunspell/TestMorphData.cs | 4 +-
.../Analysis/Hunspell/TestNeedAffix.cs | 4 +-
.../Analysis/Hunspell/TestOnlyInCompound.cs | 4 +-
.../Analysis/Hunspell/TestOptionalCondition.cs | 7 +-
.../Analysis/Hunspell/TestSpaces.cs | 4 +-
.../Analysis/Hunspell/TestStemmer.cs | 10 +--
.../Analysis/Hunspell/TestStrangeOvergeneration.cs | 4 +-
.../Analysis/Hunspell/TestTwoFold.cs | 8 +--
.../Analysis/Hunspell/TestTwoSuffixes.cs | 8 +--
.../Analysis/Hunspell/TestZeroAffix.cs | 4 +-
.../Analysis/Hunspell/TestZeroAffix2.cs | 4 +-
.../TestOpenNLPSentenceBreakIterator.cs | 4 +-
.../BenchmarkTestCase.cs | 10 +--
.../ByTask/Tasks/AddIndexesTaskTest.cs | 4 +-
.../ByTask/TestPerfTasksLogic.cs | 18 ++---
.../Taxonomy/TestTaxonomyFacetAssociations.cs | 20 +++---
.../Taxonomy/TestTaxonomyFacetCounts2.cs | 10 +--
src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs | 14 ++--
.../Document/TestLazyDocument.cs | 8 +--
.../Index/Sorter/IndexSortingTest.cs | 4 +-
.../Index/Sorter/SorterTestBase.cs | 8 +--
.../Index/Sorter/SortingAtomicReaderTest.cs | 4 +-
.../Misc/TestHighFreqTerms.cs | 12 ++--
.../Precedence/TestPrecedenceQueryParser.cs | 8 +--
.../Flexible/Standard/TestNumericQueryParser.cs | 12 ++--
.../Flexible/Standard/TestQPHelper.cs | 14 ++--
.../Messages/TestQueryParserMessagesOverridden.cs | 8 +--
.../Util/QueryParserTestBase.cs | 16 ++---
src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs | 8 +--
.../Queries/TestSortedSetSortFieldSelectors.cs | 10 +--
.../Configuration/TestConfigurationSettings.cs | 10 ++-
.../Configuration/TestSystemProperties.cs | 8 +--
.../Lucene3x/TestLucene3xStoredFieldsFormat.cs | 6 +-
.../Codecs/Lucene3x/TestSurrogates.cs | 4 +-
.../Codecs/Lucene3x/TestTermInfosReaderIndex.cs | 8 +--
.../Codecs/Lucene40/TestLucene40DocValuesFormat.cs | 4 +-
.../Codecs/Lucene40/TestLucene40PostingsFormat.cs | 4 +-
.../Codecs/Lucene40/TestLucene40PostingsReader.cs | 4 +-
.../Lucene40/TestLucene40StoredFieldsFormat.cs | 4 +-
.../Lucene40/TestLucene40TermVectorsFormat.cs | 4 +-
.../Codecs/Lucene40/TestReuseDocsEnum.cs | 4 +-
.../Lucene41/TestLucene41StoredFieldsFormat.cs | 4 +-
.../Codecs/Lucene42/TestLucene42DocValuesFormat.cs | 4 +-
src/Lucene.Net.Tests/Index/Test2BDocs.cs | 8 +--
.../Index/TestBackwardsCompatibility.cs | 8 +--
.../Index/TestBackwardsCompatibility3x.cs | 8 +--
src/Lucene.Net.Tests/Index/TestCodecs.cs | 4 +-
src/Lucene.Net.Tests/Index/TestFieldsReader.cs | 8 +--
.../Index/TestFlushByRamOrCountsPolicy.cs | 8 +--
src/Lucene.Net.Tests/Index/TestIndexInput.cs | 18 ++---
.../Index/TestIndexWriterExceptions.cs | 4 +-
src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs | 8 +--
.../Search/Payloads/TestPayloadNearQuery.cs | 8 +--
.../Search/Payloads/TestPayloadTermQuery.cs | 8 +--
src/Lucene.Net.Tests/Search/Spans/TestBasics.cs | 12 ++--
.../Search/Spans/TestFieldMaskingSpanQuery.cs | 12 ++--
src/Lucene.Net.Tests/Search/TestBoolean2.cs | 8 +--
.../Search/TestBooleanMinShouldMatch.cs | 12 ++--
.../Search/TestControlledRealTimeReopenThread.cs | 4 +-
src/Lucene.Net.Tests/Search/TestDateFilter.cs | 8 +--
src/Lucene.Net.Tests/Search/TestExplanations.cs | 8 +--
src/Lucene.Net.Tests/Search/TestFieldCache.cs | 10 ++-
src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs | 12 ++--
.../Search/TestMultiTermConstantScore.cs | 10 +--
.../Search/TestMultiTermQueryRewrites.cs | 12 ++--
.../Search/TestNGramPhraseQuery.cs | 14 ++--
.../Search/TestNumericRangeQuery32.cs | 12 ++--
.../Search/TestNumericRangeQuery64.cs | 12 ++--
src/Lucene.Net.Tests/Search/TestPhraseQuery.cs | 8 +--
.../Search/TestPrefixInBooleanQuery.cs | 14 ++--
src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs | 8 +--
src/Lucene.Net.Tests/Search/TestTermVectors.cs | 14 ++--
.../Util/TestIndexableBinaryStringTools.cs | 4 +-
.../Configuration/ConfigurationSettingsTest.cs | 10 +--
.../tools/Lucene.Net.Tests.Cli/InstallationTest.cs | 8 +--
103 files changed, 428 insertions(+), 463 deletions(-)
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index 80c51f61a..adb35b277 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -348,9 +348,9 @@ namespace Lucene.Net.Index
}
[NUnit.Framework.OneTimeSetUp]
- public override void BeforeClass() // Renamed from CreatePostings to
ensure the base class setup is called before this one
+ public override void OneTimeSetUp() // Renamed from CreatePostings to
ensure the base class setup is called before this one
{
- base.BeforeClass();
+ base.OneTimeSetUp();
totalPostings = 0;
totalPayloadBytes = 0;
@@ -375,7 +375,7 @@ namespace Lucene.Net.Index
continue;
}
- fieldInfoArray[fieldUpto] = new FieldInfo(field, true,
fieldUpto, false, false, true,
+ fieldInfoArray[fieldUpto] = new FieldInfo(field, true,
fieldUpto, false, false, true,
IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS,
DocValuesType.NONE,
DocValuesType.NUMERIC, null);
fieldUpto++;
@@ -472,13 +472,13 @@ namespace Lucene.Net.Index
}
[NUnit.Framework.OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
allTerms = null;
fieldInfos = null;
fields = null;
globalLiveDocs = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
// TODO maybe instead of @BeforeClass just make a single test run:
build postings & index & test it?
@@ -653,18 +653,18 @@ namespace Lucene.Net.Index
public DocsAndPositionsEnum ReuseDocsAndPositionsEnum { get; set; }
}
- private void VerifyEnum(ThreadState threadState,
- string field,
- BytesRef term,
+ private void VerifyEnum(ThreadState threadState,
+ string field,
+ BytesRef term,
TermsEnum termsEnum,
// Maximum options
(docs/freqs/positions/offsets) to test:
- IndexOptions maxTestOptions,
-
- IndexOptions maxIndexOptions,
- ISet<Option> options,
+ IndexOptions maxTestOptions,
+
+ IndexOptions maxIndexOptions,
+ ISet<Option> options,
bool alwaysTestMax)
-
+
{
if (Verbose)
{
@@ -698,9 +698,9 @@ namespace Lucene.Net.Index
FieldInfo fieldInfo = currentFieldInfos.FieldInfo(field);
// NOTE: can be empty list if we are using liveDocs:
- SeedPostings expected = GetSeedPostings(term.Utf8ToString(),
- fields[field][term],
- useLiveDocs,
+ SeedPostings expected = GetSeedPostings(term.Utf8ToString(),
+ fields[field][term],
+ useLiveDocs,
maxIndexOptions);
Assert.AreEqual(expected.DocFreq, termsEnum.DocFreq);
@@ -710,12 +710,12 @@ namespace Lucene.Net.Index
bool doCheckFreqs = allowFreqs && (alwaysTestMax || Random.Next(3)
<= 2);
// LUCENENET specific - to avoid boxing, changed from CompareTo()
to IndexOptionsComparer.Compare()
- bool allowPositions =
IndexOptionsComparer.Default.Compare(fieldInfo.IndexOptions,
IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0 &&
+ bool allowPositions =
IndexOptionsComparer.Default.Compare(fieldInfo.IndexOptions,
IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0 &&
IndexOptionsComparer.Default.Compare(maxTestOptions,
IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;
bool doCheckPositions = allowPositions && (alwaysTestMax ||
Random.Next(3) <= 2);
// LUCENENET specific - to avoid boxing, changed from CompareTo()
to IndexOptionsComparer.Compare()
- bool allowOffsets =
IndexOptionsComparer.Default.Compare(fieldInfo.IndexOptions,
IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >=0 &&
+ bool allowOffsets =
IndexOptionsComparer.Default.Compare(fieldInfo.IndexOptions,
IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >=0 &&
IndexOptionsComparer.Default.Compare(maxTestOptions,
IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS) >= 0;
bool doCheckOffsets = allowOffsets && (alwaysTestMax ||
Random.Next(3) <= 2);
@@ -1099,9 +1099,9 @@ namespace Lucene.Net.Index
}
}
- private void TestTerms(Fields fieldsSource, ISet<Option> options,
- IndexOptions maxTestOptions,
- IndexOptions maxIndexOptions,
+ private void TestTerms(Fields fieldsSource, ISet<Option> options,
+ IndexOptions maxTestOptions,
+ IndexOptions maxIndexOptions,
bool alwaysTestMax)
{
if (options.Contains(Option.THREADS))
@@ -1124,9 +1124,9 @@ namespace Lucene.Net.Index
}
}
- private void TestTermsOneThread(Fields fieldsSource, ISet<Option>
options,
- IndexOptions maxTestOptions,
- IndexOptions maxIndexOptions,
+ private void TestTermsOneThread(Fields fieldsSource, ISet<Option>
options,
+ IndexOptions maxTestOptions,
+ IndexOptions maxIndexOptions,
bool alwaysTestMax)
{
ThreadState threadState = new ThreadState();
@@ -1189,13 +1189,13 @@ namespace Lucene.Net.Index
savedTermState = true;
}
- VerifyEnum(threadState,
- fieldAndTerm.Field,
- fieldAndTerm.Term,
- termsEnum,
- maxTestOptions,
- maxIndexOptions,
- options,
+ VerifyEnum(threadState,
+ fieldAndTerm.Field,
+ fieldAndTerm.Term,
+ termsEnum,
+ maxTestOptions,
+ maxIndexOptions,
+ options,
alwaysTestMax);
// Sometimes save term state after pulling the enum:
@@ -1217,13 +1217,13 @@ namespace Lucene.Net.Index
Console.WriteLine("TEST: try enum again on same term");
}
- VerifyEnum(threadState,
- fieldAndTerm.Field,
- fieldAndTerm.Term,
- termsEnum,
- maxTestOptions,
- maxIndexOptions,
- options,
+ VerifyEnum(threadState,
+ fieldAndTerm.Field,
+ fieldAndTerm.Term,
+ termsEnum,
+ maxTestOptions,
+ maxIndexOptions,
+ options,
alwaysTestMax);
}
}
@@ -1348,7 +1348,7 @@ namespace Lucene.Net.Index
protected override void AddRandomFields(Document doc)
{
-
+
foreach (IndexOptions opts in Enum.GetValues(typeof(IndexOptions)))
{
// LUCENENET: Skip our NONE option
@@ -1372,4 +1372,4 @@ namespace Lucene.Net.Index
}
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
index 5d9a5f894..4a28cb3aa 100644
--- a/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BaseTermVectorsFormatTestCase.cs
@@ -492,12 +492,12 @@ namespace Lucene.Net.Index
private readonly DisposableThreadLocal<DocsAndPositionsEnum>
docsAndPositionsEnum = new DisposableThreadLocal<DocsAndPositionsEnum>();
// LUCENENET specific - cleanup DisposableThreadLocal instances after
running tests
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
termsEnum.Dispose();
docsEnum.Dispose();
docsAndPositionsEnum.Dispose();
- base.AfterClass();
+ base.OneTimeTearDown();
}
protected virtual void AssertEquals(RandomTokenStream tk, FieldType
ft, Terms terms)
diff --git a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
index 162e8e266..fe1cf558a 100644
--- a/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Search/SearchEquivalenceTestBase.cs
@@ -46,9 +46,9 @@ namespace Lucene.Net.Search
protected static string m_stopword; // we always pick a character as a
stopword
[NUnit.Framework.OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Random random = Random;
@@ -94,7 +94,7 @@ namespace Lucene.Net.Search
}
[NUnit.Framework.OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
m_reader.Dispose();
m_directory.Dispose();
@@ -103,7 +103,7 @@ namespace Lucene.Net.Search
m_directory = null;
m_analyzer = null;
m_s1 = m_s2 = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
/// <summary>
diff --git
a/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs
b/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs
index 4a1eba4b3..524a0ca9d 100644
---
a/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs
+++
b/src/Lucene.Net.TestFramework/Support/Configuration/ConfigurationSettingTestCase.cs
@@ -34,9 +34,9 @@ namespace Lucene.Net.Configuration
protected abstract IConfiguration LoadConfiguration();
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
var configuration = LoadConfiguration();
// Set up mocks for ConfigurationSettings and SystemProperties
ConfigurationSettings = new
ConfigurationSettingsImpl(configuration);
diff --git
a/src/Lucene.Net.TestFramework/Support/Util/LuceneTestFrameworkInitializer.cs
b/src/Lucene.Net.TestFramework/Support/Util/LuceneTestFrameworkInitializer.cs
index d3391b121..b04b6ed63 100644
---
a/src/Lucene.Net.TestFramework/Support/Util/LuceneTestFrameworkInitializer.cs
+++
b/src/Lucene.Net.TestFramework/Support/Util/LuceneTestFrameworkInitializer.cs
@@ -261,7 +261,7 @@ namespace Lucene.Net.Util
/// Access to the current <see cref="System.Random"/> instance. It is
safe to use
/// this method from multiple threads, etc., but it should be called
while within a runner's
/// scope (so no static initializers). The returned <see
cref="System.Random"/> instance will be
- /// <b>different</b> when this method is called inside a <see
cref="LuceneTestCase.BeforeClass()"/> hook (static
+ /// <b>different</b> when this method is called inside a <see
cref="LuceneTestCase.OneTimeSetUp()"/> hook (static
/// suite scope) and within <see cref="OneTimeSetUpAttribute"/>/ <see
cref="OneTimeTearDownAttribute"/> hooks or test methods.
///
/// <para/>The returned instance must not be shared with other threads
or cross a single scope's
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 56016c3ff..52ccaf1ab 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -66,8 +66,14 @@ namespace Lucene.Net.Util
/// <h3>Class and instance setup.</h3>
///
/// <para>
- /// The preferred way to specify class (suite-level) setup/cleanup is to
use
- /// static methods annotated with <see cref="OneTimeSetUp"/> and <see
cref="OneTimeTearDown"/>. Any
+ /// The preferred way to specify class (suite-level) setup/cleanup is to
override
+ /// <see cref="OneTimeSetUp"/> and <see cref="OneTimeTearDown"/>. Be sure
+ /// to call <c>base.OneTimeSetUp()</c> BEFORE you initialize your class and
+ /// call <c>base.OneTimeTearDown()</c> AFTER you clean up your class. NUnit
+ /// will find the <see cref="NUnit.Framework.OneTimeSetUpAttribute"/> and
+ /// <see cref="NUnit.Framework.OneTimeTearDownAttribute"/> of the base
class,
+ /// so using them on the <see cref="OneTimeSetUp"/> and
+ /// <see cref="OneTimeTearDown"/> method overrides is not strictly
required. Any
/// code in these methods is executed within the test framework's control
and
/// ensure proper setup has been made. <b>Try not to use static
initializers
/// (including complex readonly field initializers).</b> Static
initializers are
@@ -977,12 +983,12 @@ namespace Lucene.Net.Util
/// Sets up dependency injection of codec factories for running the
test class,
/// and also picks random defaults for culture, time zone, similarity,
and default codec.
/// <para/>
- /// If you override this method, be sure to call
<c>base.BeforeClass()</c> BEFORE setting
+ /// If you override this method, be sure to call
<c>base.OneTimeSetUp()</c> BEFORE setting
/// up your test fixture.
/// </summary>
// LUCENENET specific method for setting up dependency injection of
test classes.
[OneTimeSetUp]
- public virtual void BeforeClass()
+ public virtual void OneTimeSetUp()
{
try
{
@@ -995,19 +1001,19 @@ namespace Lucene.Net.Util
catch (Exception ex)
{
// Write the stack trace so we have something to go on if an
error occurs here.
- throw new Exception($"An exception occurred during
BeforeClass:\n{ex}", ex);
+ throw new Exception($"An exception occurred during
OneTimeSetUp:\n{ex}", ex);
}
}
/// <summary>
/// Tears down random defaults and cleans up temporary files.
/// <para/>
- /// If you override this method, be sure to call
<c>base.AfterClass()</c> AFTER
+ /// If you override this method, be sure to call
<c>base.OneTimeTearDown()</c> AFTER
/// tearing down your test fixture.
/// </summary>
// LUCENENET specific method for setting up dependency injection of
test classes.
[OneTimeTearDown]
- public virtual void AfterClass()
+ public virtual void OneTimeTearDown()
{
try
{
@@ -1017,7 +1023,7 @@ namespace Lucene.Net.Util
catch (Exception ex)
{
// Write the stack trace so we have something to go on if an
error occurs here.
- throw new Exception($"An exception occurred during
AfterClass:\n{ex}", ex);
+ throw new Exception($"An exception occurred during
OneTimeTearDown:\n{ex}", ex);
}
}
@@ -1029,7 +1035,7 @@ namespace Lucene.Net.Util
/// Access to the current <see cref="System.Random"/> instance. It is
safe to use
/// this method from multiple threads, etc., but it should be called
while within a runner's
/// scope (so no static initializers). The returned <see
cref="System.Random"/> instance will be
- /// <b>different</b> when this method is called inside a <see
cref="BeforeClass()"/> hook (static
+ /// <b>different</b> when this method is called inside a <see
cref="OneTimeSetUp()"/> hook (static
/// suite scope) and within <see cref="Before"/>/ <see cref="After"/>
hooks or test methods.
///
/// <para/>The returned instance must not be shared with other threads
or cross a single scope's
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
index a06ab1290..984011273 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -196,15 +196,15 @@ namespace Lucene.Net.Analysis.Core
}
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
IEnumerable<Type> analysisClasses =
typeof(StandardAnalyzer).Assembly.GetTypes()
.Where(c => {
var typeInfo = c;
- return !typeInfo.IsAbstract && typeInfo.IsPublic &&
!typeInfo.IsInterface
+ return !typeInfo.IsAbstract && typeInfo.IsPublic &&
!typeInfo.IsInterface
&& typeInfo.IsClass &&
(typeInfo.GetCustomAttribute<ObsoleteAttribute>() is null)
&& (typeInfo.IsSubclassOf(typeof(Tokenizer)) ||
typeInfo.IsSubclassOf(typeof(TokenFilter)) ||
typeInfo.IsSubclassOf(typeof(CharFilter)));
})
@@ -225,19 +225,19 @@ namespace Lucene.Net.Analysis.Core
if (typeInfo.IsSubclassOf(typeof(Tokenizer)))
{
- assertTrue(ctor.ToString() + " has unsupported
parameter types",
+ assertTrue(ctor.ToString() + " has unsupported
parameter types",
allowedTokenizerArgs.containsAll(ctor.GetParameters().Select(p =>
p.ParameterType).ToArray()));
tokenizers.Add(ctor);
}
else if (typeInfo.IsSubclassOf(typeof(TokenFilter)))
{
- assertTrue(ctor.ToString() + " has unsupported
parameter types",
+ assertTrue(ctor.ToString() + " has unsupported
parameter types",
allowedTokenFilterArgs.containsAll(ctor.GetParameters().Select(p =>
p.ParameterType).ToArray()));
tokenfilters.Add(ctor);
}
else if (typeInfo.IsSubclassOf(typeof(CharFilter)))
{
- assertTrue(ctor.ToString() + " has unsupported
parameter types",
+ assertTrue(ctor.ToString() + " has unsupported
parameter types",
allowedCharFilterArgs.containsAll(ctor.GetParameters().Select(p =>
p.ParameterType).ToArray()));
charfilters.Add(ctor);
}
@@ -259,15 +259,15 @@ namespace Lucene.Net.Analysis.Core
Console.WriteLine("charfilters = " + charfilters);
}
}
-
+
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
tokenizers = null;
tokenfilters = null;
charfilters = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
@@ -1113,7 +1113,7 @@ namespace Lucene.Net.Analysis.Core
return m_input.Read();
}
- // LUCENENET: TextReader dosn't support this overload
+ // LUCENENET: TextReader dosn't support this overload
//public int read(char[] cbuf)
//{
// readSomething = true;
@@ -1214,4 +1214,4 @@ namespace Lucene.Net.Analysis.Core
}
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs
index 33294b717..8b5c30643 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestAlternateCasing : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("alternate-casing.aff", "alternate-casing.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
index dddd52041..bdf66497a 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
@@ -23,9 +23,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestCaseInsensitive : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init(true, "simple.aff", "mixedcase.dic");
}
@@ -87,4 +87,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("solre");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs
index fcdd361d5..8fe5bb629 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestCaseSensitive : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("casesensitive.aff", "casesensitive.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
index c54b74124..499922428 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
@@ -23,9 +23,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestCircumfix_ : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("circumfix.aff", "circumfix.dic");
}
@@ -41,4 +41,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("legeslegnagy");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
index 63db496fd..284826046 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
@@ -23,9 +23,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestComplexPrefix : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("complexprefix.aff", "complexprefix.dic");
}
@@ -43,4 +43,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("ptwoponefoosuf");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
index a4e5c945a..cbd27c947 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
@@ -23,9 +23,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestCondition : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("condition.aff", "condition.dic");
}
@@ -46,4 +46,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("helloed");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition2.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition2.cs
index 186f3cacd..3ebc746ec 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition2.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition2.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestCondition2 : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("condition2.aff", "condition2.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConditionGH418.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConditionGH418.cs
index 5865d8e6e..f98c27404 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConditionGH418.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConditionGH418.cs
@@ -24,9 +24,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestConditionGH418 : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("condition-issue-418.aff", "condition-issue-418.dic");
}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
index 912cb9c4d..3413ac8b7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
@@ -23,9 +23,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestConv : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("conv.aff", "conv.dic");
}
[Test]
@@ -38,4 +38,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("drinkABle", "drInk");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
index cdfd87e33..572903a2c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
@@ -23,11 +23,12 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestDependencies_ : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("dependencies.aff", "dependencies.dic");
}
+
[Test]
public virtual void TestDependencies()
{
@@ -42,4 +43,4 @@ namespace Lucene.Net.Analysis.Hunspell
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDoubleEscape.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDoubleEscape.cs
index c376766ec..74edafcaa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDoubleEscape.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDoubleEscape.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestDoubleEscape : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("double-escaped.aff", "double-escaped.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
index 4b776949e..bab567ed7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
@@ -23,11 +23,12 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestEscaped : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("escaped.aff", "escaped.dic");
}
+
[Test]
public virtual void TestStemming()
{
@@ -39,4 +40,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("N/As");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
index 31baf605e..1b292dba4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
@@ -23,11 +23,12 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestFlagLong : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("flaglong.aff", "flaglong.dic");
}
+
[Test]
public virtual void TestLongFlags()
{
@@ -37,4 +38,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("foobogus");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
index b82036d71..e1a2f0ffb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
@@ -23,11 +23,12 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestFlagNum : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("flagnum.aff", "flagnum.dic");
}
+
[Test]
public virtual void TestNumFlags()
{
@@ -36,4 +37,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("fooss");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFullStrip.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFullStrip.cs
index 4d66ec3e4..59b126de4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFullStrip.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFullStrip.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestFullStrip : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("fullstrip.aff", "fullstrip.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
index 272a47ee9..e05cb055f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
@@ -22,17 +22,17 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestHomonyms : StemmerTestBase
{
-
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("homonyms.aff", "homonyms.dic");
}
+
[Test]
public virtual void TestExamples()
{
AssertStemsTo("works", "work", "work");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
index f1228a016..1c5b7c5c2 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -30,9 +30,9 @@ namespace Lucene.Net.Analysis.Hunspell
private static Dictionary dictionary;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
System.IO.Stream affixStream =
typeof(TestStemmer).getResourceAsStream("simple.aff");
System.IO.Stream dictStream =
typeof(TestStemmer).getResourceAsStream("simple.dic");
try
@@ -46,10 +46,10 @@ namespace Lucene.Net.Analysis.Hunspell
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
dictionary = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
/// <summary>
@@ -126,4 +126,4 @@ namespace Lucene.Net.Analysis.Hunspell
CheckOneTerm(a, "NoChAnGy", "NoChAnGy");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
index 35fafdbea..4b3d1264d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
@@ -22,13 +22,13 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestIgnore : StemmerTestBase
{
-
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("ignore.aff", "ignore.dic");
}
+
[Test]
public virtual void TestExamples()
{
@@ -39,4 +39,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("'-'-'-");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestKeepCase.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestKeepCase.cs
index f0a81cc18..205e97c43 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestKeepCase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestKeepCase.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestKeepCase : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("keepcase.aff", "keepcase.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
index 9fccba1b4..70327eab5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
@@ -22,13 +22,13 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestMorph : StemmerTestBase
{
-
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("morph.aff", "morph.dic");
}
+
[Test]
public virtual void TestExamples()
{
@@ -37,4 +37,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("drinkableable");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphAlias.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphAlias.cs
index 20a72588e..b4c30be56 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphAlias.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphAlias.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestMorphAlias : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("morphalias.aff", "morphalias.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphData.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphData.cs
index 0978fc37a..3d28146f9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphData.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphData.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestMorphData : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("morphdata.aff", "morphdata.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestNeedAffix.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestNeedAffix.cs
index 8ac9aa7ba..02c821ae7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestNeedAffix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestNeedAffix.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestNeedAffix : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("needaffix.aff", "needaffix.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOnlyInCompound.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOnlyInCompound.cs
index d9700aaf8..d2e40d19b 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOnlyInCompound.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOnlyInCompound.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestOnlyInCompound : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("onlyincompound.aff", "onlyincompound.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
index 94b9a149c..b2252b616 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
@@ -23,11 +23,12 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestOptionalCondition : StemmerTestBase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("optional-condition.aff", "condition.dic");
}
+
[Test]
public virtual void TestStemming()
{
@@ -45,4 +46,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("helloed");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestSpaces.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestSpaces.cs
index 2aebb8e6e..d8c9a4b12 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestSpaces.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestSpaces.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestSpaces : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("spaces.aff", "spaces.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
index 4a5681402..b69528725 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
@@ -22,24 +22,26 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestStemmer : StemmerTestBase
{
-
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("simple.aff", "simple.dic");
}
+
[Test]
public virtual void TestSimpleSuffix()
{
AssertStemsTo("lucene", "lucene", "lucen");
AssertStemsTo("mahoute", "mahout");
}
+
[Test]
public virtual void TestSimplePrefix()
{
AssertStemsTo("solr", "olr");
}
+
[Test]
public virtual void TestRecursiveSuffix()
{
@@ -85,4 +87,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("solre");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStrangeOvergeneration.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStrangeOvergeneration.cs
index 730d242a1..e0a2c7284 100644
---
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStrangeOvergeneration.cs
+++
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStrangeOvergeneration.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestStrangeOvergeneration : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("strange-overgeneration.aff", "strange-overgeneration.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
index fdbad8ac9..f6965b305 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
@@ -22,13 +22,13 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestTwoFold : StemmerTestBase
{
-
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("twofold.aff", "morph.dic");
}
+
[Test]
public virtual void TestExamples()
{
@@ -40,4 +40,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("drinks");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
index 87495220b..b7e529dac 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
@@ -22,13 +22,13 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestTwoSuffixes : StemmerTestBase
{
-
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("twosuffixes.aff", "twosuffixes.dic");
}
+
[Test]
public virtual void TestExamples()
{
@@ -39,4 +39,4 @@ namespace Lucene.Net.Analysis.Hunspell
AssertStemsTo("drinkss");
}
}
-}
\ No newline at end of file
+}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix.cs
index e0321554d..4da61680c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestZeroAffix : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("zeroaffix.aff", "zeroaffix.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix2.cs
b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix2.cs
index b22f1864d..edbc81fcb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix2.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix2.cs
@@ -22,9 +22,9 @@ namespace Lucene.Net.Analysis.Hunspell
public class TestZeroAffix2 : StemmerTestBase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Init("zeroaffix2.aff", "zeroaffix2.dic");
}
diff --git
a/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs
b/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs
index f5c54f5b1..4e83e035e 100644
--- a/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs
+++ b/src/Lucene.Net.Tests.Analysis.OpenNLP/TestOpenNLPSentenceBreakIterator.cs
@@ -39,9 +39,9 @@ namespace Lucene.Net.Analysis.OpenNlp
private const String PADDING = " Word. Word. ";
private const String sentenceModelFile = "en-test-sent.bin";
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
PopulateCache();
}
diff --git a/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs
b/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs
index 15e0edf7a..de12cf0c5 100644
--- a/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs
+++ b/src/Lucene.Net.Tests.Benchmark/BenchmarkTestCase.cs
@@ -31,9 +31,9 @@ namespace Lucene.Net.Benchmarks
{
private static DirectoryInfo WORKDIR;
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
WORKDIR = CreateTempDir("benchmark");
// LUCENENET: Our directory numbers are sequential. Doing a delete
// here will make threads collide.
@@ -47,10 +47,10 @@ namespace Lucene.Net.Benchmarks
};
}
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
WORKDIR = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
@@ -88,7 +88,7 @@ namespace Lucene.Net.Benchmarks
return getWorkDir().FullName.Replace("\\", "/");
}
- // create the benchmark and execute it.
+ // create the benchmark and execute it.
public Benchmark execBenchmark(String[] algLines)
{
String algText = algLinesToText(algLines);
diff --git a/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/AddIndexesTaskTest.cs
b/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/AddIndexesTaskTest.cs
index 5fea5a5b3..6bc57725b 100644
--- a/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/AddIndexesTaskTest.cs
+++ b/src/Lucene.Net.Tests.Benchmark/ByTask/Tasks/AddIndexesTaskTest.cs
@@ -32,9 +32,9 @@ namespace Lucene.Net.Benchmarks.ByTask.Tasks
{
private static DirectoryInfo testDir, inputDir;
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
testDir = CreateTempDir("addIndexesTask");
// create a dummy index under inputDir
diff --git a/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs
b/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs
index 3df0078d6..5e71b0004 100644
--- a/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs
+++ b/src/Lucene.Net.Tests.Benchmark/ByTask/TestPerfTasksLogic.cs
@@ -49,9 +49,9 @@ namespace Lucene.Net.Benchmarks.ByTask
// copyToWorkDir("test-mapping-ISOLatin1Accent-partial.txt");
//}
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
copyToWorkDir("reuters.first20.lines.txt");
copyToWorkDir("test-mapping-ISOLatin1Accent-partial.txt");
}
@@ -85,7 +85,7 @@ namespace Lucene.Net.Benchmarks.ByTask
// 4. test specific checks after the benchmark run completed.
assertEquals("TestSearchTask was supposed to be called!", 279,
CountingSearchTestTask.numSearches);
assertTrue("Index does not exist?...!",
DirectoryReader.IndexExists(benchmark.RunData.Directory));
- // now we should be able to open the index for write.
+ // now we should be able to open the index for write.
IndexWriter iw = new IndexWriter(benchmark.RunData.Directory,
new IndexWriterConfig(TEST_VERSION_CURRENT, new
MockAnalyzer(Random))
.SetOpenMode(OpenMode.APPEND));
@@ -306,7 +306,7 @@ namespace Lucene.Net.Benchmarks.ByTask
// 4. test specific checks after the benchmark run completed.
assertEquals("TestSearchTask was supposed to be called!", 139,
CountingSearchTestTask.numSearches);
assertTrue("Index does not exist?...!",
DirectoryReader.IndexExists(benchmark.RunData.Directory));
- // now we should be able to open the index for write.
+ // now we should be able to open the index for write.
IndexWriter iw = new IndexWriter(benchmark.RunData.Directory, new
IndexWriterConfig(TEST_VERSION_CURRENT, new
MockAnalyzer(Random)).SetOpenMode(OpenMode.APPEND));
iw.Dispose();
IndexReader ir = DirectoryReader.Open(benchmark.RunData.Directory);
@@ -419,7 +419,7 @@ namespace Lucene.Net.Benchmarks.ByTask
{
if (numLines == 0 &&
line.StartsWith(WriteLineDocTask.FIELDS_HEADER_INDICATOR,
StringComparison.Ordinal))
{
- continue; // do not count the header line as a doc
+ continue; // do not count the header line as a doc
}
numLines++;
}
@@ -445,7 +445,7 @@ namespace Lucene.Net.Benchmarks.ByTask
// Run algo
benchmark = execBenchmark(algLines2);
- // now we should be able to open the index for write.
+ // now we should be able to open the index for write.
IndexWriter iw = new IndexWriter(benchmark.RunData.Directory,
new IndexWriterConfig(TEST_VERSION_CURRENT, new
MockAnalyzer(Random))
.SetOpenMode(OpenMode.APPEND));
@@ -964,7 +964,7 @@ namespace Lucene.Net.Benchmarks.ByTask
benchmark = execBenchmark(getLocaleConfig("ROOT"));
assertEquals(CultureInfo.InvariantCulture,
benchmark.RunData.Locale);
- // specify just a language
+ // specify just a language
benchmark = execBenchmark(getLocaleConfig("de"));
assertEquals(new CultureInfo("de"), benchmark.RunData.Locale);
@@ -976,7 +976,7 @@ namespace Lucene.Net.Benchmarks.ByTask
//benchmark = execBenchmark(getLocaleConfig("no,NO,NY"));
//assertEquals(new CultureInfo("no-NO"/*, "NY"*/),
benchmark.RunData.Locale);
- // LUCENENET specific - in .NET Norwegian is specified as either
nb-NO (Bokmål) or
+ // LUCENENET specific - in .NET Norwegian is specified as either
nb-NO (Bokmål) or
// nn-NO (Nynorsk) + a few other dialects. no-NO works sometimes,
but is not
// supported across all OS's, so doesn't make a reliable test case.
benchmark = execBenchmark(getLocaleConfig("nb,NO,NY"));
@@ -1035,7 +1035,7 @@ namespace Lucene.Net.Benchmarks.ByTask
//expected = new ICUCollationKeyAnalyzer(TEST_VERSION_CURRENT,
Collator.Create(new CultureInfo("no-NO"/*, "NY"*/),
Collator.Fallback.FallbackAllowed));
//assertEqualCollation(expected, benchmark.RunData.Analyzer,
"foobar");
- // LUCENENET specific - in .NET Norwegian is specified as either
nb-NO (Bokmål) or
+ // LUCENENET specific - in .NET Norwegian is specified as either
nb-NO (Bokmål) or
// nn-NO (Nynorsk) + a few other dialects. no-NO works sometimes,
but is not
// supported across all OS's, so doesn't make a reliable test case.
diff --git
a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index c113719ab..359afb207 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Facet.Taxonomy
using IOUtils = Lucene.Net.Util.IOUtils;
/// <summary>
- /// Test for associations
+ /// Test for associations
/// </summary>
[TestFixture]
public class TestTaxonomyFacetAssociations : FacetTestCase
@@ -48,14 +48,10 @@ namespace Lucene.Net.Facet.Taxonomy
private static FacetsConfig config;
- /// <summary>
- /// LUCENENET specific
- /// Is non-static because Similarity and TimeZone are not static.
- /// </summary>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = NewDirectory();
taxoDir = NewDirectory();
@@ -98,7 +94,7 @@ namespace Lucene.Net.Facet.Taxonomy
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
reader = null;
@@ -109,7 +105,7 @@ namespace Lucene.Net.Facet.Taxonomy
taxoDir.Dispose();
taxoDir = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
@@ -144,7 +140,7 @@ namespace Lucene.Net.Facet.Taxonomy
/// <summary>
/// Make sure we can test both int and float assocs in one
- /// index, as long as we send each to a different field.
+ /// index, as long as we send each to a different field.
/// </summary>
[Test]
public virtual void TestIntAndFloatAssocation()
@@ -163,7 +159,7 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(150, (int)facets.GetSpecificValue("int", "b"),
"Wrong count for category 'b'!");
}
-
+
[Test]
public virtual void TestWrongIndexFieldName()
{
@@ -284,4 +280,4 @@ namespace Lucene.Net.Facet.Taxonomy
Assert.AreEqual(150, (int)facets.GetSpecificValue("int", "b"),
"Wrong count for category 'b'!");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index c7d1c5aa8..74bbed9d7 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -88,10 +88,10 @@ namespace Lucene.Net.Facet.Taxonomy
private static IDictionary<string, int> allExpectedCounts,
termExpectedCounts;
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - renamed from
AfterClassCountingFacetsAggregatorTest() to ensure calling order
+ public override void OneTimeTearDown() // LUCENENET specific - renamed
from AfterClassCountingFacetsAggregatorTest() to ensure calling order
{
IOUtils.Dispose(indexDir, taxoDir);
- base.AfterClass();
+ base.OneTimeTearDown();
}
private static IList<FacetField> RandomCategories(Random random)
@@ -246,9 +246,9 @@ namespace Lucene.Net.Facet.Taxonomy
}
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from BeforeClassCountingFacetsAggregatorTest() to ensure calling order
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from BeforeClassCountingFacetsAggregatorTest() to ensure calling order
{
- base.BeforeClass();
+ base.OneTimeSetUp();
indexDir = NewDirectory();
taxoDir = NewDirectory();
@@ -401,4 +401,4 @@ namespace Lucene.Net.Facet.Taxonomy
IOUtils.Dispose(indexReader, taxoReader);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index 34d1c42f4..4abeec81c 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Facet
private static FacetsConfig config;
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - renamed from
AfterClassDrillDownQueryTest() to ensure calling order
+ public override void OneTimeTearDown() // LUCENENET specific - renamed
from AfterClassDrillDownQueryTest() to ensure calling order
{
IOUtils.Dispose(reader, taxo, dir, taxoDir);
reader = null;
@@ -64,13 +64,13 @@ namespace Lucene.Net.Facet
taxoDir = null;
config = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from BeforeClassDrillDownQueryTest() to ensure calling order
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from BeforeClassDrillDownQueryTest() to ensure calling order
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = NewDirectory();
Random r = Random;
@@ -174,7 +174,7 @@ namespace Lucene.Net.Facet
Assert.AreEqual(5, docs.TotalHits);
// Check that content:foo (which yields 50% results) and facet/b
(which yields 20%)
- // would gather together 10 results (10%..)
+ // would gather together 10 results (10%..)
Query fooQuery = new TermQuery(new Term("content", "foo"));
DrillDownQuery q4 = new DrillDownQuery(config, fooQuery);
q4.Add("b");
@@ -199,7 +199,7 @@ namespace Lucene.Net.Facet
Assert.AreEqual(5, docs.TotalHits);
// Check that content:foo (which yields 50% results) and facet/b
(which yields 20%)
- // would gather together 10 results (10%..)
+ // would gather together 10 results (10%..)
Query fooQuery = new TermQuery(new Term("content", "foo"));
DrillDownQuery q4 = new DrillDownQuery(config, fooQuery);
q4.Add("b");
@@ -280,4 +280,4 @@ namespace Lucene.Net.Facet
Assert.AreSame(@base, rewrite);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
index f30cf81e5..43d0b3308 100644
--- a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
+++ b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Documents
public Directory dir = NewDirectory();
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - changed from
RemoveIndex() to ensure calling order vs base class
+ public override void OneTimeTearDown() // LUCENENET specific - changed
from RemoveIndex() to ensure calling order vs base class
{
if (null != dir)
{
@@ -56,13 +56,13 @@ namespace Lucene.Net.Documents
catch (Exception e) when (e.IsException()) { /* NOOP */ }
}
- base.AfterClass();
+ base.OneTimeTearDown();
}
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - changed
from CreateIndex() to ensure calling order vs base class
+ public override void OneTimeSetUp() // LUCENENET specific - changed
from CreateIndex() to ensure calling order vs base class
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Analyzer analyzer = new MockAnalyzer(Random);
IndexWriter writer = new IndexWriter
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
index 9f525b23d..2bd75ecf1 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
@@ -36,9 +36,9 @@ namespace Lucene.Net.Index.Sorter
};
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from BeforeClassSorterUtilTest() to ensure calling order vs base class
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from BeforeClassSorterUtilTest() to ensure calling order vs base class
{
- base.BeforeClass();
+ base.OneTimeSetUp();
// only read the values of the undeleted documents, since after
addIndexes,
// the deleted ones will be dropped from the index.
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
index 5f20de1d4..1695df297 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -207,9 +207,9 @@ namespace Lucene.Net.Index.Sorter
}
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from BeforeClassSorterTestBase() to ensure calling order vs base class
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from BeforeClassSorterTestBase() to ensure calling order vs base class
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = NewDirectory();
int numDocs = AtLeast(20);
@@ -219,12 +219,12 @@ namespace Lucene.Net.Index.Sorter
}
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - renamed from
AfterClassSorterTestBase() to ensure calling order vs base class
+ public override void OneTimeTearDown() // LUCENENET specific - renamed
from AfterClassSorterTestBase() to ensure calling order vs base class
{
reader.Dispose();
dir.Dispose();
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
index 9a734de61..678c5ad18 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
@@ -27,9 +27,9 @@ namespace Lucene.Net.Index.Sorter
public class SortingAtomicReaderTest : SorterTestBase
{
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from BeforeClassSortingAtomicReaderTest() to ensure calling order vs base class
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from BeforeClassSortingAtomicReaderTest() to ensure calling order vs base class
{
- base.BeforeClass();
+ base.OneTimeSetUp();
// sort the index by id (as integer, in NUMERIC_DV_FIELD)
Sort sort = new Sort(new SortField(NUMERIC_DV_FIELD,
SortFieldType.INT32));
diff --git a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
index 65ab7d4e1..5db600213 100644
--- a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
+++ b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
@@ -38,9 +38,9 @@ namespace Lucene.Net.Misc
private static IndexReader reader = null;
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from SetUpClass() to ensure calling order vs base class
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from SetUpClass() to ensure calling order vs base class
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = NewDirectory();
writer = new IndexWriter(dir, NewIndexWriterConfig(Random,
@@ -52,7 +52,7 @@ namespace Lucene.Net.Misc
}
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - renamed from
TearDownClass() to ensure calling order vs base class
+ public override void OneTimeTearDown() // LUCENENET specific - renamed
from TearDownClass() to ensure calling order vs base class
{
reader.Dispose();
dir.Dispose();
@@ -60,7 +60,7 @@ namespace Lucene.Net.Misc
reader = null;
writer = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
/******************** Tests for getHighFreqTerms
**********************************/
@@ -231,7 +231,7 @@ namespace Lucene.Net.Misc
Random rnd = Random;
/**
- * Generate 10 documents where term n has a docFreq of n and a
totalTermFreq of n*2 (squared).
+ * Generate 10 documents where term n has a docFreq of n and a
totalTermFreq of n*2 (squared).
*/
for (int i = 1; i <= 10; i++)
{
@@ -294,7 +294,7 @@ namespace Lucene.Net.Misc
/**
* getContent
* return string containing numbers 1 to i with each number n
occurring n times.
- * i.e. for input of 3 return string "3 3 3 2 2 1"
+ * i.e. for input of 3 return string "3 3 3 2 2 1"
*/
private static string GetContent(int i)
diff --git
a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
index 223785d4c..9ddce61c0 100644
---
a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
+++
b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
@@ -48,17 +48,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence
public static Analyzer qpAnalyzer;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
qpAnalyzer = new QPTestAnalyzer();
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
qpAnalyzer = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
public sealed class QPTestFilter : TokenFilter
diff --git
a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
index bfb740b7c..f3b21199f 100644
---
a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
+++
b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
private static Analyzer? ANALYZER;
private static NumberFormat? NUMBER_FORMAT;
-
+
private static StandardQueryParser? qp;
@@ -131,9 +131,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
ANALYZER = new MockAnalyzer(Random);
@@ -260,7 +260,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
continue;
}
- numericConfigMap[type.ToString()] = new
NumericConfig(PRECISION_STEP, NUMBER_FORMAT, type);
+ numericConfigMap[type.ToString()] = new
NumericConfig(PRECISION_STEP, NUMBER_FORMAT, type);
FieldType ft2 = new FieldType(Int32Field.TYPE_NOT_STORED);
ft2.NumericType = (type);
@@ -663,7 +663,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader?.Dispose();
@@ -672,7 +672,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
directory = null;
qp = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
}
}
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
index 9346907fc..13448ef3d 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
@@ -42,7 +42,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
/// <summary>
/// This test case is a copy of the core Lucene query parser test, it was
adapted
/// to use new QueryParserHelper instead of the old query parser.
- ///
+ ///
/// Tests QueryParser.
/// </summary>
// TODO: really this should extend QueryParserTestBase too!
@@ -51,17 +51,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
public static Analyzer qpAnalyzer;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
qpAnalyzer = new QPTestAnalyzer();
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
qpAnalyzer = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
public sealed class QPTestFilter : TokenFilter
@@ -801,7 +801,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
IDictionary<string, DateResolution> dateRes = new
Dictionary<string, DateResolution>();
- // set a field specific date resolution
+ // set a field specific date resolution
dateRes[monthField] = DateResolution.MONTH;
#pragma warning disable 612, 618
qp.SetDateResolution(dateRes);
@@ -851,7 +851,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
* assertQueryEquals("\\[brackets", null, "brackets");
* assertQueryEquals("\\\\", a, "\\\\");
assertQueryEquals("\\+blah", a,
* "\\+blah"); assertQueryEquals("\\(blah", a, "\\(blah");
- *
+ *
* assertQueryEquals("\\-blah", a, "\\-blah");
assertQueryEquals("\\!blah",
* a, "\\!blah"); assertQueryEquals("\\{blah", a, "\\{blah");
* assertQueryEquals("\\}blah", a, "\\}blah");
assertQueryEquals("\\:blah",
diff --git
a/src/Lucene.Net.Tests.QueryParser/Support/Flexible/Core/Messages/TestQueryParserMessagesOverridden.cs
b/src/Lucene.Net.Tests.QueryParser/Support/Flexible/Core/Messages/TestQueryParserMessagesOverridden.cs
index f80a8e841..ea686a9df 100644
---
a/src/Lucene.Net.Tests.QueryParser/Support/Flexible/Core/Messages/TestQueryParserMessagesOverridden.cs
+++
b/src/Lucene.Net.Tests.QueryParser/Support/Flexible/Core/Messages/TestQueryParserMessagesOverridden.cs
@@ -25,21 +25,21 @@ namespace
Lucene.Net.QueryParsers.Support.Flexible.Core.Messages
public class TestQueryParserMessagesOverridden : LuceneTestCase
{
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
var provider = new
QueryParserResourceProvider(MessagesTest.ResourceManager);
QueryParserMessages.SetResourceProvider(provider);
}
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
// Return to the default
var provider = new QueryParserResourceProvider();
QueryParserMessages.SetResourceProvider(provider);
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
index 21cc3e1b7..0b7c025d1 100644
--- a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.QueryParsers.Util
{
/// <summary>
/// In .NET the abstact members were moved to AbstractQueryParserTestBase
- /// because the Visual Studio test runner does not find or run tests in
+ /// because the Visual Studio test runner does not find or run tests in
/// abstract classes.
/// </summary>
[TestFixture]
@@ -48,17 +48,17 @@ namespace Lucene.Net.QueryParsers.Util
public static Analyzer qpAnalyzer;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
qpAnalyzer = new QPTestAnalyzer();
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
qpAnalyzer = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
public sealed class QPTestFilter : TokenFilter
@@ -675,7 +675,7 @@ namespace Lucene.Net.QueryParsers.Util
{
// we use the default Locale since LuceneTestCase randomizes it
DateTime d = DateTime.ParseExact(s,
CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern,
CultureInfo.CurrentCulture);
- return GetDate(d, resolution);
+ return GetDate(d, resolution);
}
/// <summary>for testing DateTools support</summary>
@@ -729,7 +729,7 @@ namespace Lucene.Net.QueryParsers.Util
// set default date resolution to MILLISECOND
qp.SetDateResolution(DateResolution.MILLISECOND);
- // set second field specific date resolution
+ // set second field specific date resolution
SetDateResolution(qp, hourField, DateResolution.HOUR);
// for this field no field specific date resolution has been set,
@@ -834,7 +834,7 @@ namespace Lucene.Net.QueryParsers.Util
// Tests bug LUCENE-800
AssertQueryEquals("(item:\\\\ item:ABCD\\\\)", a, "item:\\
item:ABCD\\");
- AssertParseException("(item:\\\\ item:ABCD\\\\))"); // unmatched
closing paranthesis
+ AssertParseException("(item:\\\\ item:ABCD\\\\))"); // unmatched
closing paranthesis
AssertQueryEquals("\\*", a, "*");
AssertQueryEquals("\\\\", a, "\\"); // escaped backslash
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
index c759ddc00..5bb9c16dc 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
@@ -38,9 +38,9 @@ namespace Lucene.Net.QueryParsers.Xml
private static IndexSearcher searcher;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
// TODO: rewrite test (this needs to set
QueryParser.enablePositionIncrements, too, for work with CURRENT):
Analyzer analyzer = new MockAnalyzer(Random,
MockTokenizer.WHITESPACE, true, MockTokenFilter.ENGLISH_STOPSET);
@@ -71,7 +71,7 @@ namespace Lucene.Net.QueryParsers.Xml
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
dir.Dispose();
@@ -79,7 +79,7 @@ namespace Lucene.Net.QueryParsers.Xml
searcher = null;
dir = null;
builder = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git
a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
index d1120cf35..90ad9c228 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
@@ -37,9 +37,9 @@ namespace Lucene.Net.Sandbox.Queries
static Codec savedCodec;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
savedCodec = Codec.Default;
// currently only these codecs that support random access ordinals
@@ -53,11 +53,11 @@ namespace Lucene.Net.Sandbox.Queries
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
- Codec.Default = (savedCodec);
+ Codec.Default = savedCodec;
- base.AfterClass();
+ base.OneTimeTearDown();
}
public override void SetUp()
diff --git
a/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs
b/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs
index 9fa28e64c..5e4584584 100644
---
a/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs
+++
b/src/Lucene.Net.Tests.TestFramework/Configuration/TestConfigurationSettings.cs
@@ -38,10 +38,8 @@ namespace Lucene.Net.Configuration
private readonly static string currentJsonFilePath =
Path.Combine(testDirectory, TestJsonFileName);
private readonly static string parentJsonFilePath =
Path.Combine(parentDirectory, TestJsonFileName);
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
-
-
// Create directories if they do not exist
Directory.CreateDirectory(testDirectory);
@@ -65,10 +63,10 @@ namespace Lucene.Net.Configuration
string testValue = "setup";
Environment.SetEnvironmentVariable(testKey, testValue);
- base.BeforeClass();
+ base.OneTimeSetUp();
}
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
DirectoryInfo dir = null;
@@ -110,7 +108,7 @@ namespace Lucene.Net.Configuration
}
catch { }
- base.AfterClass();
+ base.OneTimeTearDown();
}
private static readonly IConfigurationFactory ConfigurationFactory =
new TestConfigurationFactory
diff --git
a/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs
b/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs
index 2858b9185..d79f9bdf1 100644
--- a/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Configuration/TestSystemProperties.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Configuration
private readonly static string currentJsonFilePath =
Path.Combine(testDirectory, TestJsonFileName);
private readonly static string parentJsonFilePath =
Path.Combine(parentDirectory, TestJsonFileName);
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
// Create directories if they do not exist
Directory.CreateDirectory(testDirectory);
@@ -55,10 +55,10 @@ namespace Lucene.Net.Configuration
input.CopyTo(output);
}
- base.BeforeClass();
+ base.OneTimeSetUp();
}
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
DirectoryInfo dir = null;
@@ -100,7 +100,7 @@ namespace Lucene.Net.Configuration
}
catch { }
- base.AfterClass();
+ base.OneTimeTearDown();
}
diff --git
a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
index f53f3eb2a..9b0d59c78 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
@@ -25,9 +25,9 @@ namespace Lucene.Net.Codecs.Lucene3x
public class TestLucene3xStoredFieldsFormat :
BaseStoredFieldsFormatTestCase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
@@ -45,4 +45,4 @@ namespace Lucene.Net.Codecs.Lucene3x
// and merge into newly formed 3.x segments.
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
index 90f89bfde..215046485 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestSurrogates.cs
@@ -38,9 +38,9 @@ namespace Lucene.Net.Codecs.Lucene3x
/// we will manually instantiate preflex-rw here
/// </summary>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true;
}
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index df24ac6e1..dd759cef1 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -74,9 +74,9 @@ namespace Lucene.Net.Codecs.Lucene3x
/// we will manually instantiate preflex-rw here
/// </summary>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
// NOTE: turn off compound file, this test will open some index
files directly.
OldFormatImpersonationIsActive = true;
@@ -121,7 +121,7 @@ namespace Lucene.Net.Codecs.Lucene3x
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
termEnum.Dispose();
reader.Dispose();
@@ -131,7 +131,7 @@ namespace Lucene.Net.Codecs.Lucene3x
directory = null;
index = null;
sampleTerms = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git
a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
index fef438318..00becccc2 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -30,9 +30,9 @@ namespace Lucene.Net.Codecs.Lucene40
private readonly Codec codec = new Lucene40RWCodec();
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsFormat.cs
b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsFormat.cs
index ad3d5810f..3bf0d4f85 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsFormat.cs
@@ -30,9 +30,9 @@ namespace Lucene.Net.Codecs.Lucene40
private readonly Codec codec = new Lucene40RWCodec();
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs
b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs
index 922dd547c..442e33f66 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40PostingsReader.cs
@@ -60,9 +60,9 @@ namespace Lucene.Net.Codecs.Lucene40
}
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git
a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
index d3d07753e..f97a123f6 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
@@ -25,9 +25,9 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40StoredFieldsFormat :
BaseStoredFieldsFormatTestCase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git
a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
index 011fb385e..dec408156 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
@@ -25,9 +25,9 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestLucene40TermVectorsFormat : BaseTermVectorsFormatTestCase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
index ff23c4127..fd4a23569 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -52,9 +52,9 @@ namespace Lucene.Net.Codecs.Lucene40
public class TestReuseDocsEnum : LuceneTestCase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git
a/src/Lucene.Net.Tests/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
b/src/Lucene.Net.Tests/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
index 0c9275fe7..5df16298c 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -25,9 +25,9 @@ namespace Lucene.Net.Codecs.Lucene41
public class TestLucene41StoredFieldsFormat :
BaseStoredFieldsFormatTestCase
{
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git
a/src/Lucene.Net.Tests/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
b/src/Lucene.Net.Tests/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
index 8d39a581e..114f20ccc 100644
--- a/src/Lucene.Net.Tests/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -30,9 +30,9 @@ namespace Lucene.Net.Codecs.Lucene42
private readonly Codec codec = new Lucene42RWCodec();
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
OldFormatImpersonationIsActive = true; // explicitly instantiates
ancient codec
}
diff --git a/src/Lucene.Net.Tests/Index/Test2BDocs.cs
b/src/Lucene.Net.Tests/Index/Test2BDocs.cs
index aa689a602..76ba91c9d 100644
--- a/src/Lucene.Net.Tests/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BDocs.cs
@@ -32,9 +32,9 @@ namespace Lucene.Net.Index
internal static Directory dir;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = NewFSDirectory(CreateTempDir("2Bdocs"));
IndexWriter iw = new IndexWriter(dir, new
IndexWriterConfig(TEST_VERSION_CURRENT, null));
@@ -48,11 +48,11 @@ namespace Lucene.Net.Index
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
dir.Dispose();
dir = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
index ad0cf561c..4989ce80e 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
@@ -218,9 +218,9 @@ namespace Lucene.Net.Index
}
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Assert.IsFalse(OldFormatImpersonationIsActive, "test infra is
broken!");
JCG.List<string> names = new JCG.List<string>(oldNames.Length +
oldSingleSegmentNames.Length);
@@ -239,14 +239,14 @@ namespace Lucene.Net.Index
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
foreach (Directory d in oldIndexDirs.Values)
{
d.Dispose();
}
oldIndexDirs = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
/// <summary>
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
index fbeb4a0c8..336580ff9 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
@@ -148,9 +148,9 @@ namespace Lucene.Net.Index
internal static IDictionary<string, Directory> oldIndexDirs;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
assertFalse("test infra is broken!",
OldFormatImpersonationIsActive);
JCG.List<string> names = new JCG.List<string>(oldNames.Length +
oldSingleSegmentNames.Length);
@@ -169,14 +169,14 @@ namespace Lucene.Net.Index
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
foreach (Directory d in oldIndexDirs.Values)
{
d.Dispose();
}
oldIndexDirs = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
/// <summary>
diff --git a/src/Lucene.Net.Tests/Index/TestCodecs.cs
b/src/Lucene.Net.Tests/Index/TestCodecs.cs
index 7e090a0c1..411d878e5 100644
--- a/src/Lucene.Net.Tests/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/Index/TestCodecs.cs
@@ -92,9 +92,9 @@ namespace Lucene.Net.Index
private const int TERM_DOC_FREQ_RAND = 20;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
NUM_TEST_ITER = AtLeast(20);
}
diff --git a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
index 23c6030f1..feb5cb3bf 100644
--- a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
@@ -45,9 +45,9 @@ namespace Lucene.Net.Index
private static FieldInfos.Builder fieldInfos = null;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
testDoc = new Document();
fieldInfos = new FieldInfos.Builder();
@@ -66,13 +66,13 @@ namespace Lucene.Net.Index
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
dir.Dispose();
dir = null;
fieldInfos = null;
testDoc = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
index ad49c21b0..ae61c4a7e 100644
--- a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
@@ -48,18 +48,18 @@ namespace Lucene.Net.Index
private static LineFileDocs lineDocFile;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
lineDocFile = new LineFileDocs(Random,
DefaultCodecSupportsDocValues);
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
lineDocFile.Dispose();
lineDocFile = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Index/TestIndexInput.cs
b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
index e4c9228e3..2d0ada12c 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
@@ -45,13 +45,13 @@ namespace Lucene.Net.Index
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x7F,
0x06, (byte) 'L', (byte) 'u', (byte) 'c', (byte) 'e', (byte) 'n',
(byte) 'e',
- // 2-byte UTF-8 (U+00BF "INVERTED QUESTION MARK")
+ // 2-byte UTF-8 (U+00BF "INVERTED QUESTION MARK")
0x02, (byte) 0xC2, (byte) 0xBF,
0x0A, (byte) 'L', (byte) 'u', (byte) 0xC2, (byte) 0xBF,
(byte) 'c', (byte) 'e', (byte) 0xC2, (byte) 0xBF,
(byte) 'n', (byte) 'e',
- // 3-byte UTF-8 (U+2620 "SKULL AND CROSSBONES")
+ // 3-byte UTF-8 (U+2620 "SKULL AND CROSSBONES")
0x03, (byte) 0xE2, (byte) 0x98, (byte) 0xA0,
0x0C, (byte) 'L', (byte) 'u', (byte) 0xE2, (byte) 0x98, (byte)
0xA0,
(byte) 'c', (byte) 'e', (byte) 0xE2, (byte) 0x98, (byte)
0xA0,
@@ -67,12 +67,12 @@ namespace Lucene.Net.Index
(byte) 0xF0, (byte) 0x9D, (byte) 0x84, (byte) 0x9E,
(byte) 'c', (byte) 'e',
(byte) 0xF0, (byte) 0x9D, (byte) 0x85, (byte) 0xA0,
- (byte) 'n', (byte) 'e',
+ (byte) 'n', (byte) 'e',
// null bytes
0x01, 0x00,
0x08, (byte) 'L', (byte) 'u', 0x00, (byte) 'c', (byte) 'e', 0x00,
(byte) 'n', (byte) 'e',
-
+
// tests for Exceptions on invalid values
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x17,
(byte) 0x01, // guard value
@@ -86,9 +86,9 @@ namespace Lucene.Net.Index
internal static byte[] RANDOM_TEST_BYTES;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
Random random = Random;
INTS = new int[COUNT];
@@ -117,12 +117,12 @@ namespace Lucene.Net.Index
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
INTS = null;
LONGS = null;
RANDOM_TEST_BYTES = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
private void CheckReads(DataInput @is, Type expectedEx)
@@ -229,4 +229,4 @@ namespace Lucene.Net.Index
CheckRandomReads(@is);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index e54ed5c0b..c9fb51f41 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -280,10 +280,10 @@ namespace Lucene.Net.Index
internal DisposableThreadLocal<Thread> doFail = new
DisposableThreadLocal<Thread>();
// LUCENENET specific - cleanup DisposableThreadLocal instances after
running tests
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
doFail.Dispose();
- base.AfterClass();
+ base.OneTimeTearDown();
}
private class TestPoint1 : ITestPoint
diff --git a/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs
b/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs
index 1829f6150..ca3906948 100644
--- a/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/Search/BaseTestRangeFilter.cs
@@ -98,9 +98,9 @@ namespace Lucene.Net.Search
}
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific: renamed from
BeforeClassBaseTestRangeFilter() so we can override to control the order of
execution
+ public override void OneTimeSetUp() // LUCENENET specific: renamed
from BeforeClassBaseTestRangeFilter() so we can override to control the order
of execution
{
- base.BeforeClass();
+ base.OneTimeSetUp();
maxId = AtLeast(500);
signedIndexDir = new TestIndex(Random, int.MaxValue, int.MinValue,
true);
@@ -110,7 +110,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific: renamed from
AfterClassBaseTestRangeFilter() so we can override to control the order of
execution
+ public override void OneTimeTearDown() // LUCENENET specific: renamed
from AfterClassBaseTestRangeFilter() so we can override to control the order of
execution
{
signedIndexReader?.Dispose();
unsignedIndexReader?.Dispose();
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search
unsignedIndexReader = null;
signedIndexDir = null;
unsignedIndexDir = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
private static IndexReader Build(Random random, TestIndex index)
diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
index 5998c78ff..8bc77f2d2 100644
--- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadNearQuery.cs
@@ -115,9 +115,9 @@ namespace Lucene.Net.Search.Payloads
}
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random, directory,
@@ -140,14 +140,14 @@ namespace Lucene.Net.Search.Payloads
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader.Dispose();
reader = null;
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
index 7f499ac53..377c43b59 100644
--- a/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Payloads/TestPayloadTermQuery.cs
@@ -122,9 +122,9 @@ namespace Lucene.Net.Search.Payloads
}
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random, directory,
@@ -149,14 +149,14 @@ namespace Lucene.Net.Search.Payloads
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader.Dispose();
reader = null;
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
index f68dbaec1..d54678ae9 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestBasics.cs
@@ -97,14 +97,10 @@ namespace Lucene.Net.Search.Spans
internal static Analyzer simplePayloadAnalyzer;
- /// <summary>
- /// LUCENENET specific
- /// Is non-static because NewIndexWriterConfig is no longer static.
- /// </summary>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
simplePayloadAnalyzer = Analyzer.NewAnonymous(createComponents:
(fieldName, reader2) =>
{
@@ -129,7 +125,7 @@ namespace Lucene.Net.Search.Spans
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
directory.Dispose();
@@ -137,7 +133,7 @@ namespace Lucene.Net.Search.Spans
reader = null;
directory = null;
simplePayloadAnalyzer = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
index 875571a6d..1492bc239 100644
--- a/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -57,14 +57,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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random,
directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new
MockAnalyzer(Random)).SetMergePolicy(NewLogMergePolicy()));
@@ -132,14 +128,14 @@ namespace Lucene.Net.Search.Spans
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader.Dispose();
reader = null;
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
protected internal virtual void Check(SpanQuery q, int[] docs)
diff --git a/src/Lucene.Net.Tests/Search/TestBoolean2.cs
b/src/Lucene.Net.Tests/Search/TestBoolean2.cs
index aff66d14f..6f7b69d07 100644
--- a/src/Lucene.Net.Tests/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/Search/TestBoolean2.cs
@@ -61,9 +61,9 @@ namespace Lucene.Net.Search
private static int mulFactor;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random,
directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new
MockAnalyzer(Random)).SetMergePolicy(NewLogMergePolicy()));
@@ -124,7 +124,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
littleReader.Dispose();
@@ -136,7 +136,7 @@ namespace Lucene.Net.Search
dir2 = null;
directory = null;
bigSearcher = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
private static readonly string[] docFields =
diff --git a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
index 2b8b9ee1f..1c77c349b 100644
--- a/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/Search/TestBooleanMinShouldMatch.cs
@@ -45,14 +45,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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
string[] data =
{
@@ -88,14 +84,14 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
s = null;
r.Dispose();
r = null;
index.Dispose();
index = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
public virtual void VerifyNrHits(Query q, int expected)
diff --git a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
index ee9d3a4df..4df3b8426 100644
--- a/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
+++ b/src/Lucene.Net.Tests/Search/TestControlledRealTimeReopenThread.cs
@@ -84,10 +84,10 @@ namespace Lucene.Net.Search
private bool warmCalled;
// LUCENENET specific - cleanup DisposableThreadLocal instances
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
lastGens.Dispose();
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Search/TestDateFilter.cs
b/src/Lucene.Net.Tests/Search/TestDateFilter.cs
index fb183d157..fb1fda7c5 100644
--- a/src/Lucene.Net.Tests/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/Search/TestDateFilter.cs
@@ -38,9 +38,9 @@ namespace Lucene.Net.Search
public class TestDateFilter : LuceneTestCase
{
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from TestBefore() to ensure calling order vs base class
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from TestBefore() to ensure calling order vs base class
{
- base.BeforeClass();
+ base.OneTimeSetUp();
// create an index
Directory indexStore = NewDirectory();
@@ -103,7 +103,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - renamed from
TestAfter() to ensure calling order vs base class
+ public override void OneTimeTearDown() // LUCENENET specific - renamed
from TestAfter() to ensure calling order vs base class
{
// create an index
Directory indexStore = NewDirectory();
@@ -158,7 +158,7 @@ namespace Lucene.Net.Search
reader.Dispose();
indexStore.Dispose();
- base.AfterClass();
+ base.OneTimeTearDown();
}
}
}
diff --git a/src/Lucene.Net.Tests/Search/TestExplanations.cs
b/src/Lucene.Net.Tests/Search/TestExplanations.cs
index 75c889f3e..8dab9ff88 100644
--- a/src/Lucene.Net.Tests/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/Search/TestExplanations.cs
@@ -63,20 +63,20 @@ namespace Lucene.Net.Search
public const string ALTFIELD = "alt";
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - renamed from
AfterClassTestExplanations() to ensure calling order
+ public override void OneTimeTearDown() // LUCENENET specific - renamed
from AfterClassTestExplanations() to ensure calling order
{
searcher = null;
reader.Dispose();
reader = null;
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from BeforeClassTestExplanations() to ensure calling order
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from BeforeClassTestExplanations() to ensure calling order
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random,
directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new
MockAnalyzer(Random)).SetMergePolicy(NewLogMergePolicy()));
diff --git a/src/Lucene.Net.Tests/Search/TestFieldCache.cs
b/src/Lucene.Net.Tests/Search/TestFieldCache.cs
index 6cb1542dc..390daa7e5 100644
--- a/src/Lucene.Net.Tests/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/Search/TestFieldCache.cs
@@ -104,12 +104,10 @@ namespace Lucene.Net.Search
base.TearDown();
}
-
- // LUCENENET: Changed to non-static because NewIndexWriterConfig is
non-static
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
NUM_DOCS = AtLeast(500);
NUM_ORDS = AtLeast(2);
@@ -173,7 +171,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
reader = null;
@@ -181,7 +179,7 @@ namespace Lucene.Net.Search
directory = null;
unicodeStrings = null;
multiValued = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
index b202e9b1d..68d6cfe81 100644
--- a/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/Search/TestMinShouldMatch2.cs
@@ -62,14 +62,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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = NewDirectory();
RandomIndexWriter iw = new RandomIndexWriter(Random, dir);
@@ -118,7 +114,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
atomicReader.Dispose();
dir.Dispose();
@@ -126,7 +122,7 @@ namespace Lucene.Net.Search
atomicReader = null;
r = null;
dir = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
private static void AddSome(Document doc, string[] values)
diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs
b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs
index 621313f03..3e20bf19a 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiTermConstantScore.cs
@@ -45,15 +45,15 @@ namespace Lucene.Net.Search
public const float SCORE_COMP_THRESH = 1e-6f;
// LUCENENET specific - made these instance variables
- // since our BeforeClass() and AfterClass() are instance
+ // since our OneTimeSetUp() and OneTimeTearDown() are instance
// methods and not doing so makes them cross runner threads.
internal /*static*/ Directory small;
internal /*static*/ IndexReader reader;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
string[] data = new string[] { "A 1 2 3 4 5 6", "Z 4 5 6",
null, "B 2 4 5 6", "Y 3 5 6", null, "C 3 6", "X 4 5 6"
};
@@ -77,13 +77,13 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader?.Dispose();
small?.Dispose();
reader = null;
small = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
/// <summary>
diff --git a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
index d9533117e..95645b0fe 100644
--- a/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/Search/TestMultiTermQueryRewrites.cs
@@ -47,14 +47,10 @@ namespace Lucene.Net.Search
private static IndexReader reader, multiReader, multiReaderDupls;
private static IndexSearcher searcher, multiSearcher,
multiSearcherDupls;
- /// <summary>
- /// LUCENENET specific
- /// Is non-static because Similarity and TimeZone are not static.
- /// </summary>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = NewDirectory();
sdir1 = NewDirectory();
@@ -88,7 +84,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
multiReader.Dispose();
@@ -99,7 +95,7 @@ namespace Lucene.Net.Search
reader = multiReader = multiReaderDupls = null;
searcher = multiSearcher = multiSearcherDupls = null;
dir = sdir1 = sdir2 = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
private Query ExtractInnerQuery(Query q)
diff --git a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
index b2699f825..cb82fea61 100644
--- a/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestNGramPhraseQuery.cs
@@ -33,14 +33,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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random,
directory);
@@ -49,13 +45,13 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
reader = null;
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
@@ -114,4 +110,4 @@ namespace Lucene.Net.Search
Assert.AreEqual(pq4.Boost, q.Boost, 0.1f);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs
b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs
index a48c6c4e3..326054aa1 100644
--- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery32.cs
@@ -62,14 +62,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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
noDocs = AtLeast(4096);
distance = (1 << 30) / noDocs;
@@ -148,14 +144,14 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader.Dispose();
reader = null;
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[SetUp]
diff --git a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs
b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs
index 71b7f7c72..23b51420e 100644
--- a/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/Search/TestNumericRangeQuery64.cs
@@ -62,14 +62,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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
noDocs = AtLeast(4096);
distance = (1L << 60) / noDocs;
@@ -159,14 +155,14 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader.Dispose();
reader = null;
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[SetUp]
diff --git a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
index 9f00d9473..c97e02229 100644
--- a/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPhraseQuery.cs
@@ -59,9 +59,9 @@ namespace Lucene.Net.Search
private static Directory directory;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
Analyzer analyzer = new AnalyzerAnonymousClass();
@@ -110,7 +110,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader.Dispose();
@@ -118,7 +118,7 @@ namespace Lucene.Net.Search
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
index e64bcfcca..814e05e70 100644
--- a/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/Search/TestPrefixInBooleanQuery.cs
@@ -46,14 +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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random,
directory);
@@ -85,7 +81,7 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
searcher = null;
reader.Dispose();
@@ -93,7 +89,7 @@ namespace Lucene.Net.Search
directory.Dispose();
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
@@ -128,4 +124,4 @@ namespace Lucene.Net.Search
Assert.AreEqual(2, searcher.Search(query, null, 1000).TotalHits,
"Number of matched documents");
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs
b/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs
index 13f45234c..bbccca535 100644
--- a/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/Search/TestSubScorerFreqs.cs
@@ -37,9 +37,9 @@ namespace Lucene.Net.Search
private static IndexSearcher s;
[OneTimeSetUp]
- public override void BeforeClass() // LUCENENET specific - renamed
from MakeIndex() to ensure calling order
+ public override void OneTimeSetUp() // LUCENENET specific - renamed
from MakeIndex() to ensure calling order
{
- base.BeforeClass();
+ base.OneTimeSetUp();
dir = new RAMDirectory();
RandomIndexWriter w = new RandomIndexWriter(Random, dir,
NewIndexWriterConfig(TEST_VERSION_CURRENT, new
MockAnalyzer(Random)).SetMergePolicy(NewLogMergePolicy()));
@@ -61,14 +61,14 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass() // LUCENENET specific - renamed from
Finish() to ensure calling order
+ public override void OneTimeTearDown() // LUCENENET specific - renamed
from Finish() to ensure calling order
{
s.IndexReader.Dispose();
s = null;
dir.Dispose();
dir = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
private class CountingCollector : ICollector
diff --git a/src/Lucene.Net.Tests/Search/TestTermVectors.cs
b/src/Lucene.Net.Tests/Search/TestTermVectors.cs
index 3ad16ed21..2a2c6cb17 100644
--- a/src/Lucene.Net.Tests/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/Search/TestTermVectors.cs
@@ -48,14 +48,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>
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
directory = NewDirectory();
RandomIndexWriter writer = new RandomIndexWriter(Random,
directory, NewIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random,
MockTokenizer.SIMPLE, true)).SetMergePolicy(NewLogMergePolicy()));
@@ -97,14 +93,14 @@ namespace Lucene.Net.Search
}
[OneTimeTearDown]
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
reader.Dispose();
directory.Dispose();
reader = null;
directory = null;
- base.AfterClass();
+ base.OneTimeTearDown();
}
// In a single doc, for the same field, mix the term
@@ -276,4 +272,4 @@ namespace Lucene.Net.Search
IOUtils.Dispose(target, input[0], input[1]);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs
b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs
index 2c578f72a..93f5eb4be 100644
--- a/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs
+++ b/src/Lucene.Net.Tests/Util/TestIndexableBinaryStringTools.cs
@@ -32,9 +32,9 @@ namespace Lucene.Net.Util
private static int MAX_RANDOM_BINARY_LENGTH;
[OneTimeSetUp]
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
NUM_RANDOM_TESTS = AtLeast(200);
MAX_RANDOM_BINARY_LENGTH = AtLeast(300);
diff --git
a/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/ConfigurationSettingsTest.cs
b/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/ConfigurationSettingsTest.cs
index e64efb30f..f6d1d8eac 100644
---
a/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/ConfigurationSettingsTest.cs
+++
b/src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/ConfigurationSettingsTest.cs
@@ -39,14 +39,14 @@ namespace Lucene.Net.Cli.Configuration
protected override IConfiguration LoadConfiguration()
{
IConfigurationRoot configuration = new ConfigurationBuilder()
- .AddEnvironmentVariables(prefix: EnvironmentVariablePrefix) //
Use a custom prefix to only load Lucene.NET settings
+ .AddEnvironmentVariables(prefix: EnvironmentVariablePrefix) //
Use a custom prefix to only load Lucene.NET settings
.AddJsonFile(TestJsonFilePath)
.Build();
return configuration;
}
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
// Create directories if they do not exist
Directory.CreateDirectory(TempFileDirectory);
@@ -62,10 +62,10 @@ namespace Lucene.Net.Cli.Configuration
string testKey = EnvironmentVariablePrefix + "tests:setup";
string testValue = "setup";
Environment.SetEnvironmentVariable(testKey, testValue);
- base.BeforeClass();
+ base.OneTimeSetUp();
}
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
try
{
@@ -79,7 +79,7 @@ namespace Lucene.Net.Cli.Configuration
}
catch { }
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
diff --git a/src/dotnet/tools/Lucene.Net.Tests.Cli/InstallationTest.cs
b/src/dotnet/tools/Lucene.Net.Tests.Cli/InstallationTest.cs
index 978196307..5ab86c57e 100644
--- a/src/dotnet/tools/Lucene.Net.Tests.Cli/InstallationTest.cs
+++ b/src/dotnet/tools/Lucene.Net.Tests.Cli/InstallationTest.cs
@@ -40,9 +40,9 @@ namespace Lucene.Net.Tests.Cli
private static DirectoryInfo tempWork;
private static string packageVersion;
- public override void BeforeClass()
+ public override void OneTimeSetUp()
{
- base.BeforeClass();
+ base.OneTimeSetUp();
tempWork = CreateTempDir();
FileInfo packageFile;
@@ -79,11 +79,11 @@ namespace Lucene.Net.Tests.Cli
AssertCommandExitCode(ExitCode.Success, "dotnet", $"tool install
{LuceneCliToolName} --version {packageVersion} --framework {targetFramework}
--add-source \"{packageFile.DirectoryName}\" --tool-path
\"{tempWork.FullName}\"");
}
- public override void AfterClass()
+ public override void OneTimeTearDown()
{
// Uninstall our tool - we are done with it.
AssertCommandExitCode(ExitCode.Success, "dotnet", $"tool uninstall
{LuceneCliToolName} --tool-path \"{tempWork.FullName}\"");
- base.AfterClass();
+ base.OneTimeTearDown();
}
[Test]
