You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2016/12/19 03:24:05 UTC

[3/5] lucenenet git commit: Revert "Replacing obsolete [TestFixtureTearDown] with [OneTimeTearDown]"

Revert "Replacing obsolete [TestFixtureTearDown] with [OneTimeTearDown]"

This reverts commit fd7aeba146b92c8149373e4543830be1fac6b03d.


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

Branch: refs/heads/master
Commit: 10efe5b98311a7241cb23fadea3882fedb4f547d
Parents: 1a36bec
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Dec 19 10:15:06 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Dec 19 10:15:06 2016 +0700

----------------------------------------------------------------------
 src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs   | 2 +-
 .../Analysis/Core/TestRandomChains.cs                              | 2 +-
 .../Analysis/Hunspell/TestHunspellStemFilter.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/SorterTestBase.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/TestTermInfosReaderIndex.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/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 +-
 42 files changed, 42 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 dfe233b..ffef930 100644
--- a/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Index/BasePostingsFormatTestCase.cs
@@ -488,7 +488,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             AllTerms = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 c745f8a..fb2676a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -249,7 +249,7 @@ namespace Lucene.Net.Analysis.Core
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             tokenizers = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 dfe7655..413d99b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Analysis.Hunspell
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void afterClass()
         {
             dictionary = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 dbc9e24..8cdd14d 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetAssociations.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.Facet.Taxonomy
             taxoReader = new DirectoryTaxonomyReader(taxoDir);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 600e969..09d1119 100644
--- a/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
+++ b/src/Lucene.Net.Tests.Facet/Taxonomy/TestTaxonomyFacetCounts2.cs
@@ -85,7 +85,7 @@ namespace Lucene.Net.Facet.Taxonomy
         private static Net.Store.Directory indexDir, taxoDir;
         private static IDictionary<string, int?> allExpectedCounts, termExpectedCounts;
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassCountingFacetsAggregatorTest()
         {
             IOUtils.Close(indexDir, taxoDir);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 8c2b263..01f7fe5 100644
--- a/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
+++ b/src/Lucene.Net.Tests.Facet/TestDrillDownQuery.cs
@@ -56,7 +56,7 @@ namespace Lucene.Net.Facet
         private static FacetsConfig config;
 
       
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassDrillDownQueryTest()
         {
             IOUtils.Close(reader, taxo, dir, taxoDir);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 9bf2d47..8e110a2 100644
--- a/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
+++ b/src/Lucene.Net.Tests.Misc/Document/TestLazyDocument.cs
@@ -20,7 +20,7 @@ namespace Lucene.Net.Documents
 
         public Directory dir = NewDirectory();
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void RemoveIndex()
         {
             if (null != dir)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 9be84ba..99623ad 100644
--- a/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
+++ b/src/Lucene.Net.Tests.Misc/Index/Sorter/SorterTestBase.cs
@@ -223,7 +223,7 @@ namespace Lucene.Net.Index.Sorter
             reader = SlowCompositeReaderWrapper.Wrap(DirectoryReader.Open(dir));
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassSorterTestBase()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 fe4df72..efd6ffe 100644
--- a/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
+++ b/src/Lucene.Net.Tests.Misc/Misc/TestHighFreqTerms.cs
@@ -26,7 +26,7 @@ namespace Lucene.Net.Misc
             TestUtil.CheckIndex(dir);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void TearDownClass()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 193ac04..6290faa 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Precedence/TestPrecedenceQueryParser.cs
@@ -52,7 +52,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Precedence
             qpAnalyzer = new QPTestAnalyzer();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void afterClass()
         {
             qpAnalyzer = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 a3d1527..e0dcf8f 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestNumericQueryParser.cs
@@ -567,7 +567,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
             return NUMBER_FORMAT.Parse(NUMBER_FORMAT.Format(number));
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 a1dae43..6a9c9e7 100644
--- a/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Flexible/Standard/TestQPHelper.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
             qpAnalyzer = new QPTestAnalyzer();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             qpAnalyzer = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 3d1b5b0..e6c4621 100644
--- a/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Util/QueryParserTestBase.cs
@@ -31,7 +31,7 @@ namespace Lucene.Net.QueryParsers.Util
             qpAnalyzer = new QPTestAnalyzer();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             qpAnalyzer = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 d84a8c1..b069048 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestParser.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.QueryParsers.Xml
 
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 84638aa..78119e0 100644
--- a/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Queries/TestSortedSetSortFieldSelectors.cs
@@ -50,7 +50,7 @@ namespace Lucene.Net.Sandbox.Queries
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void afterClass()
         {
             Codec.Default = (savedCodec);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 7c5eace..227e22b 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Lucene3x/TestTermInfosReaderIndex.cs
@@ -113,7 +113,7 @@ namespace Lucene.Net.Codecs.Lucene3x
             SampleTerms = Sample(Random(), Reader, 1000);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             TermEnum.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 a4d3db9..7bf3749 100644
--- a/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/core/Index/Test2BDocs.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Index
             iw.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void AfterClass()
         {
             Dir.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 5492fef..1dd70ce 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility.cs
@@ -221,7 +221,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void AfterClass()
         {
             foreach (Directory d in OldIndexDirs.Values)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 42d01e9..af1790f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestBackwardsCompatibility3x.cs
@@ -148,7 +148,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public void AfterClass()
         {
             foreach (Directory d in OldIndexDirs.Values)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 e580ae8..fa54837 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFieldsReader.cs
@@ -68,7 +68,7 @@ namespace Lucene.Net.Index
             FaultyIndexInput.DoFail = false;
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Dir.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 4e15e37..77ac69b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestFlushByRamOrCountsPolicy.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Index
             LineDocFile = new LineFileDocs(Random(), DefaultCodecSupportsDocValues());
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             LineDocFile.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 dcef226..ea1f79f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestIndexInput.cs
@@ -70,7 +70,7 @@ namespace Lucene.Net.Index
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             INTS = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 fa1209d..16a6d17 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -110,7 +110,7 @@ namespace Lucene.Net.Search
             UnsignedIndexReader = Build(Random(), UnsignedIndexDir);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassBaseTestRangeFilter()
         {
             SignedIndexReader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 10a1649..9da6e81 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadNearQuery.cs
@@ -135,7 +135,7 @@ namespace Lucene.Net.Search.Payloads
             Searcher.Similarity = Similarity;
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 6d841cf..b44ffd4 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Search.Payloads
             Searcher.Similarity = Similarity;
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 6a255fc..34529d8 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestBasics.cs
@@ -129,7 +129,7 @@ namespace Lucene.Net.Search.Spans
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 4d54777..e8ab517 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestFieldMaskingSpanQuery.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search.Spans
             Searcher = NewSearcher(Reader);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 7c6cc51..e8f2e87 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBoolean2.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Search
             riw.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 4ba6461..882b740 100644
--- a/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestBooleanMinShouldMatch.cs
@@ -74,7 +74,7 @@ namespace Lucene.Net.Search
             //System.out.println("Set up " + getName());
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             s = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 fe18320..a0154b2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestDateFilter.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.Search
         }
 
         ///
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public virtual void TestAfter()
         {
             // create an index

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 5bc1e80..18962f9 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Search
         // same contents, but no field boost
         public const string ALTFIELD = "alt";
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClassTestExplanations()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 55e2cf3..d45f364 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCache.cs
@@ -165,7 +165,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 fde85d4..c452619 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMinShouldMatch2.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Search
             }
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             atomicReader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 dbc72c3..7f95d2a 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 b0595fa..61ee69b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermQueryRewrites.cs
@@ -83,7 +83,7 @@ namespace Lucene.Net.Search
             MultiSearcherDupls = NewSearcher(MultiReaderDupls);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 068ece5..f6756c2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNGramPhraseQuery.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search
             Reader = DirectoryReader.Open(Directory);
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 fadaa16..59c527b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery32.cs
@@ -134,7 +134,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 6473977..de7b10f 100644
--- a/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestNumericRangeQuery64.cs
@@ -143,7 +143,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 63e23d7..d4710e2 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPhraseQuery.cs
@@ -108,7 +108,7 @@ namespace Lucene.Net.Search
             Query = new PhraseQuery();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 0a56ce9..22be01c 100644
--- a/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestPrefixInBooleanQuery.cs
@@ -82,7 +82,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Searcher = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 ee5c467..1b60b0e 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSubScorerFreqs.cs
@@ -59,7 +59,7 @@ namespace Lucene.Net.Search
             w.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void Finish()
         {
             s.IndexReader.Dispose();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/10efe5b9/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 c9da2da..d2a5126 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermVectors.cs
@@ -93,7 +93,7 @@ namespace Lucene.Net.Search
             writer.Dispose();
         }
 
-        [OneTimeTearDown]
+        [TestFixtureTearDown]
         public static void AfterClass()
         {
             Reader.Dispose();