lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [2/5] lucenenet git commit: Revert "Replacing obsolete [TestFixtureSetUp] with [OneTimeSetUp]"
Date Mon, 19 Dec 2016 03:24:04 GMT
Revert "Replacing obsolete [TestFixtureSetUp] with [OneTimeSetUp]"

This reverts commit 28f2f7909a67f087c276cc660c26a991c899145e.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1a36bec5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1a36bec5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1a36bec5

Branch: refs/heads/master
Commit: 1a36bec5673586711f9c519ee1a3600111ba8bbc
Parents: d50d877
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Mon Dec 19 10:14:52 2016 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Mon Dec 19 10:14:52 2016 +0700

----------------------------------------------------------------------
 src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs   | 2 +-
 .../Analysis/Core/TestRandomChains.cs                              | 2 +-
 .../Analysis/Hunspell/TestCaseInsensitive.cs                       | 2 +-
 .../Analysis/Hunspell/TestCircumfix.cs                             | 2 +-
 .../Analysis/Hunspell/TestComplexPrefix.cs                         | 2 +-
 .../Analysis/Hunspell/TestCondition.cs                             | 2 +-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs | 2 +-
 .../Analysis/Hunspell/TestDependencies.cs                          | 2 +-
 .../Analysis/Hunspell/TestEscaped.cs                               | 2 +-
 .../Analysis/Hunspell/TestFlagLong.cs                              | 2 +-
 .../Analysis/Hunspell/TestFlagNum.cs                               | 2 +-
 .../Analysis/Hunspell/TestHomonyms.cs                              | 2 +-
 .../Analysis/Hunspell/TestHunspellStemFilter.cs                    | 2 +-
 .../Analysis/Hunspell/TestIgnore.cs                                | 2 +-
 .../Analysis/Hunspell/TestMorph.cs                                 | 2 +-
 .../Analysis/Hunspell/TestOptionalCondition.cs                     | 2 +-
 .../Analysis/Hunspell/TestStemmer.cs                               | 2 +-
 .../Analysis/Hunspell/TestTwoFold.cs                               | 2 +-
 .../Analysis/Hunspell/TestTwoSuffixes.cs                           | 2 +-
 .../Taxonomy/TestTaxonomyFacetAssociations.cs                      | 2 +-
 src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs    | 2 +-
 src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs                   | 2 +-
 src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs             | 2 +-
 src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs         | 2 +-
 src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs           | 2 +-
 src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs  | 2 +-
 src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs                | 2 +-
 .../Flexible/Precedence/TestPrecedenceQueryParser.cs               | 2 +-
 .../Flexible/Standard/TestNumericQueryParser.cs                    | 2 +-
 src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs | 2 +-
 src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs       | 2 +-
 src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs                 | 2 +-
 .../Queries/TestSortedSetSortFieldSelectors.cs                     | 2 +-
 .../core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs         | 2 +-
 src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs        | 2 +-
 .../core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs               | 2 +-
 .../core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs            | 2 +-
 .../core/Codecs/Lucene40/TestLucene40PostingsFormat.cs             | 2 +-
 .../core/Codecs/Lucene40/TestLucene40PostingsReader.cs             | 2 +-
 .../core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs         | 2 +-
 .../core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs          | 2 +-
 src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs     | 2 +-
 .../core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs         | 2 +-
 .../core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs            | 2 +-
 src/Lucene.Net.Tests/core/Index/Test2BDocs.cs                      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs    | 2 +-
 src/Lucene.Net.Tests/core/Index/TestCodecs.cs                      | 2 +-
 src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs                | 2 +-
 src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs    | 2 +-
 src/Lucene.Net.Tests/core/Index/TestIndexInput.cs                  | 2 +-
 src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs            | 2 +-
 src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs  | 2 +-
 src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs  | 2 +-
 src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs               | 2 +-
 .../core/Search/Spans/TestFieldMaskingSpanQuery.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestBoolean2.cs                   | 2 +-
 src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs      | 2 +-
 src/Lucene.Net.Tests/core/Search/TestDateFilter.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestExplanations.cs               | 2 +-
 src/Lucene.Net.Tests/core/Search/TestFieldCache.cs                 | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs            | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs     | 2 +-
 src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs     | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs           | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs        | 2 +-
 src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs        | 2 +-
 src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs                | 2 +-
 src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs       | 2 +-
 src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs             | 2 +-
 src/Lucene.Net.Tests/core/Search/TestTermVectors.cs                | 2 +-
 src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs | 2 +-
 src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs   | 2 +-
 73 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
index b5f14e6..dfe233b 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -370,7 +370,7 @@ namespace Lucene.Net.Index
             return new SeedPostings(seed, minDocFreq, maxDocFreq, withLiveDocs ? GlobalLiveDocs : null, options);
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void CreatePostings()
         {
             TotalPostings = 0;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
----------------------------------------------------------------------
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 4ce045c..c745f8a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -180,7 +180,7 @@ namespace Lucene.Net.Analysis.Core
             }
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             IEnumerable<Type> analysisClasses = typeof(StandardAnalyzer).Assembly.GetTypes()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
----------------------------------------------------------------------
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 be73de9..cba206b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestCaseInsensitive : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init(true, "simple.aff", "mixedcase.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
----------------------------------------------------------------------
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 86387a6..d0c3668 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestCircumfix_ : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("circumfix.aff", "circumfix.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
----------------------------------------------------------------------
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 e0f228c..5c82714 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestComplexPrefix : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("complexprefix.aff", "complexprefix.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
----------------------------------------------------------------------
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 888c755..b9f0a41 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestCondition : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("condition.aff", "condition.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
----------------------------------------------------------------------
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 e0b1a83..9c2ad74 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestConv : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("conv.aff", "conv.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
----------------------------------------------------------------------
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 ce34433..5e2fc48 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestDependencies_ : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("dependencies.aff", "dependencies.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
----------------------------------------------------------------------
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 a4608b6..8db5602 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestEscaped : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("escaped.aff", "escaped.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
----------------------------------------------------------------------
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 0f84119..cb589ec 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestFlagLong : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("flaglong.aff", "flaglong.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
----------------------------------------------------------------------
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 cc9a33e..d1b16a3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestFlagNum : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("flagnum.aff", "flagnum.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
----------------------------------------------------------------------
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 716b61e..e07a15b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestHomonyms : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("homonyms.aff", "homonyms.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
----------------------------------------------------------------------
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 5aebc1c..dfe7655 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Analysis.Hunspell
     {
         private static Dictionary dictionary;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             System.IO.Stream affixStream = typeof(TestStemmer).getResourceAsStream("simple.aff");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
----------------------------------------------------------------------
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 c026f73..bc96964 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestIgnore : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("ignore.aff", "ignore.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
----------------------------------------------------------------------
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 0cc6cae..f371ec4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestMorph : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("morph.aff", "morph.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
----------------------------------------------------------------------
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 05028cb..7e4cd4c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
@@ -21,7 +21,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
     public class TestOptionalCondition : StemmerTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("optional-condition.aff", "condition.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
----------------------------------------------------------------------
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 cf8e4d9..358ff99 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestStemmer : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("simple.aff", "simple.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
----------------------------------------------------------------------
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 93cbc4f..12ee1c0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestTwoFold : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("twofold.aff", "morph.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
----------------------------------------------------------------------
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 7f51873..2799054 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
@@ -22,7 +22,7 @@ namespace Lucene.Net.Analysis.Hunspell
     public class TestTwoSuffixes : StemmerTestBase
     {
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Init("twosuffixes.aff", "twosuffixes.dic");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
index fc38863..dbc9e24 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Facet.Taxonomy
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
index 1999642..600e969 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -245,7 +245,7 @@ namespace Lucene.Net.Facet.Taxonomy
             return counts;
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassCountingFacetsAggregatorTest()
         {
             indexDir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
index 2ab70d8..8c2b263 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -67,7 +67,7 @@ namespace Lucene.Net.Facet
             config = null;
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassDrillDownQueryTest()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
index 5c23395..9bf2d47 100644
--- a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
+++ b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
@@ -34,7 +34,7 @@ namespace Lucene.Net.Documents
             }
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void CreateIndex()
         {
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
index b6beda4..fdc0e95 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/IndexSortingTest.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.Index.Sorter
             new Sort(new SortField(null, SortField.Type_e.DOC, true))
         };
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassSorterUtilTest()
         {
             // only read the values of the undeleted documents, since after addIndexes,

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
index 8d3ae8a..9be84ba 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -213,7 +213,7 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassSorterTestBase()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
index 9de7707..93b234a 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SortingAtomicReaderTest.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.Index.Sorter
 
     public class SortingAtomicReaderTest : SorterTestBase
     {
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClassSortingAtomicReaderTest()
         {
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
index e26ea8e..fe4df72 100644
--- a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
+++ b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
@@ -14,7 +14,7 @@ namespace Lucene.Net.Misc
         private static Directory dir = null;
         private static IndexReader reader = null;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void SetUpClass()
         {
             dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
index b806a6d..193ac04 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence
     {
         public static Analyzer qpAnalyzer;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void beforeClass()
         {
             qpAnalyzer = new QPTestAnalyzer();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
index 52745bd..a3d1527 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
@@ -73,7 +73,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
                 dateFormat, CultureInfo.CurrentCulture, DateTimeStyles.RoundtripKind, out result);
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             ANALYZER = new MockAnalyzer(Random());

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
index d9e4552..a1dae43 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
     {
         public static Analyzer qpAnalyzer;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             qpAnalyzer = new QPTestAnalyzer();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
index d81e7e3..3d1b5b0 100644
--- a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -25,7 +25,7 @@ namespace Lucene.Net.QueryParsers.Util
     {
         public static Analyzer qpAnalyzer;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             qpAnalyzer = new QPTestAnalyzer();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
index 45b7ffa..d84a8c1 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.QueryParsers.Xml
         private static IndexReader reader;
         private static IndexSearcher searcher;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             // TODO: rewrite test (this needs to set QueryParser.enablePositionIncrements, too, for work with CURRENT):

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
index b60f921..84638aa 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Sandbox.Queries
     {
         static Codec savedCodec;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void beforeClass()
         {
             savedCodec = Codec.Default;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
index 1e37cbf..d3d0889 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestLucene3xStoredFieldsFormat.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Codecs.Lucene3x
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
index cccbdfd..256eae2 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestSurrogates.cs
@@ -38,7 +38,7 @@ namespace Lucene.Net.Codecs.Lucene3x
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
index ba03722..7c5eace 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Codecs.Lucene3x
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             // NOTE: turn off compound file, this test will open some index files directly.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
index d63a6b3..3686767 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40DocValuesFormat.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
index 2d2b5f1..0d3666d 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsFormat.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
index 47cc0e6..73852cd 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40PostingsReader.cs
@@ -57,7 +57,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
index 9dc5682..4e3bebf 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40StoredFieldsFormat.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
index ba05490..9a6e544 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestLucene40TermVectorsFormat.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
index 761d63e..c335b8c 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene40/TestReuseDocsEnum.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Codecs.Lucene40
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
index 916f8d0..bcd5a49 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene41/TestLucene41StoredFieldsFormat.cs
@@ -27,7 +27,7 @@ namespace Lucene.Net.Codecs.Lucene41
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
index f9c47ce..598f373 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene42/TestLucene42DocValuesFormat.cs
@@ -32,7 +32,7 @@ namespace Lucene.Net.Codecs.Lucene42
         /// LUCENENET specific
         /// Is non-static because OLD_FORMAT_IMPERSONATION_IS_ACTIVE is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true; // explicitly instantiates ancient codec

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
index 158b9ac..a4d3db9 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Index
     {
         internal static Directory Dir;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Dir = NewFSDirectory(CreateTempDir("2Bdocs"));

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
index f7f354d..5492fef 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -202,7 +202,7 @@ namespace Lucene.Net.Index
             return null; // never get here
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Assert.IsFalse(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "test infra is broken!");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
index b5e5808..42d01e9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -129,7 +129,7 @@ namespace Lucene.Net.Index
 
         internal static IDictionary<string, Directory> OldIndexDirs;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Assert.IsFalse(OLD_FORMAT_IMPERSONATION_IS_ACTIVE, "test infra is broken!");

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
index 07feee2..1df01e9 100644
--- a/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestCodecs.cs
@@ -89,7 +89,7 @@ namespace Lucene.Net.Index
         private const int DOC_FREQ_RAND = 500; // must be > 16 to test skipping
         private const int TERM_DOC_FREQ_RAND = 20;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             NUM_TEST_ITER = AtLeast(20);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
index 405713e..e580ae8 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Index
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             TestDoc = new Document();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
index 86d1a23..4e15e37 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
@@ -39,7 +39,7 @@ namespace Lucene.Net.Index
 
         private static LineFileDocs LineDocFile;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             LineDocFile = new LineFileDocs(Random(), DefaultCodecSupportsDocValues());

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
index 37e7901..dcef226 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Index
         internal static long[] LONGS;
         internal static byte[] RANDOM_TEST_BYTES;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             Random random = Random();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
index db1290a..fa1209d 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -100,7 +100,7 @@ namespace Lucene.Net.Search
         /// Is non-static because <see cref="Build(Random, TestIndex)"/> is no
         /// longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassBaseTestRangeFilter()
         {
             MaxId = AtLeast(500);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
index a8ad290..10a1649 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -114,7 +114,7 @@ namespace Lucene.Net.Search.Payloads
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
index 27fbf3c..6d841cf 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Search.Payloads
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
index 6be72f1..6a255fc 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -97,7 +97,7 @@ namespace Lucene.Net.Search.Spans
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             SimplePayloadAnalyzer = new AnalyzerAnonymousInnerClassHelper();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
index 0c2a2ac..4d54777 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -58,7 +58,7 @@ namespace Lucene.Net.Search.Spans
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
index 605aded..7c6cc51 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
index 4e6952e..4ba6461 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -48,7 +48,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewStringField is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             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" };

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
index 11e62e1..fe18320 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
@@ -41,7 +41,7 @@ namespace Lucene.Net.Search
     public class TestDateFilter : LuceneTestCase
     {
         ///
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public virtual void TestBefore()
         {
             // create an index

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
index dc77d59..5bc1e80 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search
         /// Is non-static because NewIndexWriterConfig, NewTextField and
         /// NewStringField are no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClassTestExplanations()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
index 8f26642..55e2cf3 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
@@ -101,7 +101,7 @@ namespace Lucene.Net.Search
 
 
         // LUCENENET: Changed to non-static because NewIndexWriterConfig is non-static
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             NUM_DOCS = AtLeast(500);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
index c24b5e1..fde85d4 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
index d824b33..dbc72c3 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             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" };

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
index 44128a1..b0595fa 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Dir = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
index 0faaef9..068ece5 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -36,7 +36,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
index 92e02ba..fadaa16 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             NoDocs = AtLeast(4096);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
index 4a80fc2..6473977 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -65,7 +65,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             NoDocs = AtLeast(4096);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
index 409555e..63e23d7 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Search
         private PhraseQuery Query;
         private static Directory Directory;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
index af93996..0a56ce9 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because Similarity and TimeZone are not static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
index a48b09f..ee5c467 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.Search
         private static Directory Dir;
         private static IndexSearcher s;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void MakeIndex()
         {
             Dir = new RAMDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
index 75aa477..c9da2da 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
         /// LUCENENET specific
         /// Is non-static because NewIndexWriterConfig is no longer static.
         /// </summary>
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void BeforeClass()
         {
             Directory = NewDirectory();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs b/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
index 8e7a681..744c7b2 100644
--- a/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
+++ b/src/Lucene.Net.Tests/core/Support/TestWeakDictionaryPerformance.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Support
                 dictionary.Add(key, "value");
         }
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public void TestSetup()
         {
             keys = new SmallObject[100000];

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1a36bec5/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs b/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
index 2016f62..339e7ad 100644
--- a/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestIndexableBinaryStringTools.cs
@@ -30,7 +30,7 @@ namespace Lucene.Net.Util
         private static int NUM_RANDOM_TESTS;
         private static int MAX_RANDOM_BINARY_LENGTH;
 
-        [OneTimeSetUp]
+        [TestFixtureSetUp]
         public static void BeforeClass()
         {
             NUM_RANDOM_TESTS = AtLeast(200);


Mime
View raw message