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/10/23 13:02:16 UTC

[30/50] [abbrv] lucenenet git commit: Revert "HACK: Added stubs for all tests subclasses of abstract test classes (with [Test] attributes) and commented the [Test] attributes in the abstract classes to keep the tests from running in the wrong context."

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
index cbf656c..bf0a5fe 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldDocValuesFormat.cs
@@ -153,506 +153,5 @@ namespace Lucene.Net.Codecs.Perfield
                 }
             }
         }
-
-
-        #region BaseDocValuesFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestOneNumber()
-        {
-            base.TestOneNumber();
-        }
-
-        [Test]
-        public override void TestOneFloat()
-        {
-            base.TestOneFloat();
-        }
-
-        [Test]
-        public override void TestTwoNumbers()
-        {
-            base.TestTwoNumbers();
-        }
-
-        [Test]
-        public override void TestTwoBinaryValues()
-        {
-            base.TestTwoBinaryValues();
-        }
-
-        [Test]
-        public override void TestTwoFieldsMixed()
-        {
-            base.TestTwoFieldsMixed();
-        }
-
-        [Test]
-        public override void TestThreeFieldsMixed()
-        {
-            base.TestThreeFieldsMixed();
-        }
-
-        [Test]
-        public override void TestThreeFieldsMixed2()
-        {
-            base.TestThreeFieldsMixed2();
-        }
-
-        [Test]
-        public override void TestTwoDocumentsNumeric()
-        {
-            base.TestTwoDocumentsNumeric();
-        }
-
-        [Test]
-        public override void TestTwoDocumentsMerged()
-        {
-            base.TestTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestBigNumericRange()
-        {
-            base.TestBigNumericRange();
-        }
-
-        [Test]
-        public override void TestBigNumericRange2()
-        {
-            base.TestBigNumericRange2();
-        }
-
-        [Test]
-        public override void TestBytes()
-        {
-            base.TestBytes();
-        }
-
-        [Test]
-        public override void TestBytesTwoDocumentsMerged()
-        {
-            base.TestBytesTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestSortedBytes()
-        {
-            base.TestSortedBytes();
-        }
-
-        [Test]
-        public override void TestSortedBytesTwoDocuments()
-        {
-            base.TestSortedBytesTwoDocuments();
-        }
-
-        [Test]
-        public override void TestSortedBytesThreeDocuments()
-        {
-            base.TestSortedBytesThreeDocuments();
-        }
-
-        [Test]
-        public override void TestSortedBytesTwoDocumentsMerged()
-        {
-            base.TestSortedBytesTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestSortedMergeAwayAllValues()
-        {
-            base.TestSortedMergeAwayAllValues();
-        }
-
-        [Test]
-        public override void TestBytesWithNewline()
-        {
-            base.TestBytesWithNewline();
-        }
-
-        [Test]
-        public override void TestMissingSortedBytes()
-        {
-            base.TestMissingSortedBytes();
-        }
-
-        [Test]
-        public override void TestSortedTermsEnum()
-        {
-            base.TestSortedTermsEnum();
-        }
-
-        [Test]
-        public override void TestEmptySortedBytes()
-        {
-            base.TestEmptySortedBytes();
-        }
-
-        [Test]
-        public override void TestEmptyBytes()
-        {
-            base.TestEmptyBytes();
-        }
-
-        [Test]
-        public override void TestVeryLargeButLegalBytes()
-        {
-            base.TestVeryLargeButLegalBytes();
-        }
-
-        [Test]
-        public override void TestVeryLargeButLegalSortedBytes()
-        {
-            base.TestVeryLargeButLegalSortedBytes();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnBytes()
-        {
-            base.TestCodecUsesOwnBytes();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnSortedBytes()
-        {
-            base.TestCodecUsesOwnSortedBytes();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnBytesEachTime()
-        {
-            base.TestCodecUsesOwnBytesEachTime();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnSortedBytesEachTime()
-        {
-            base.TestCodecUsesOwnSortedBytesEachTime();
-        }
-
-        /*
-         * Simple test case to show how to use the API
-         */
-        [Test]
-        public override void TestDocValuesSimple()
-        {
-            base.TestDocValuesSimple();
-        }
-
-        [Test]
-        public override void TestRandomSortedBytes()
-        {
-            base.TestRandomSortedBytes();
-        }
-
-        [Test]
-        public override void TestBooleanNumericsVsStoredFields()
-        {
-            base.TestBooleanNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestByteNumericsVsStoredFields()
-        {
-            base.TestByteNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestByteMissingVsFieldCache()
-        {
-            base.TestByteMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestShortNumericsVsStoredFields()
-        {
-            base.TestShortNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestShortMissingVsFieldCache()
-        {
-            base.TestShortMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestIntNumericsVsStoredFields()
-        {
-            base.TestIntNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestIntMissingVsFieldCache()
-        {
-            base.TestIntMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestLongNumericsVsStoredFields()
-        {
-            base.TestLongNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestLongMissingVsFieldCache()
-        {
-            base.TestLongMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestBinaryFixedLengthVsStoredFields()
-        {
-            base.TestBinaryFixedLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestBinaryVariableLengthVsStoredFields()
-        {
-            base.TestBinaryVariableLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedFixedLengthVsStoredFields()
-        {
-            base.TestSortedFixedLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedFixedLengthVsFieldCache()
-        {
-            base.TestSortedFixedLengthVsFieldCache();
-        }
-
-        [Test]
-        public override void TestSortedVariableLengthVsFieldCache()
-        {
-            base.TestSortedVariableLengthVsFieldCache();
-        }
-
-        [Test]
-        public override void TestSortedVariableLengthVsStoredFields()
-        {
-            base.TestSortedVariableLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetOneValue()
-        {
-            base.TestSortedSetOneValue();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoFields()
-        {
-            base.TestSortedSetTwoFields();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsMerged()
-        {
-            base.TestSortedSetTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoValues()
-        {
-            base.TestSortedSetTwoValues();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoValuesUnordered()
-        {
-            base.TestSortedSetTwoValuesUnordered();
-        }
-
-        [Test]
-        public override void TestSortedSetThreeValuesTwoDocs()
-        {
-            base.TestSortedSetThreeValuesTwoDocs();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsLastMissing()
-        {
-            base.TestSortedSetTwoDocumentsLastMissing();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsLastMissingMerge()
-        {
-            base.TestSortedSetTwoDocumentsLastMissingMerge();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsFirstMissing()
-        {
-            base.TestSortedSetTwoDocumentsFirstMissing();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsFirstMissingMerge()
-        {
-            base.TestSortedSetTwoDocumentsFirstMissingMerge();
-        }
-
-        [Test]
-        public override void TestSortedSetMergeAwayAllValues()
-        {
-            base.TestSortedSetMergeAwayAllValues();
-        }
-
-        [Test]
-        public override void TestSortedSetTermsEnum()
-        {
-            base.TestSortedSetTermsEnum();
-        }
-
-        [Test]
-        public override void TestSortedSetFixedLengthVsStoredFields()
-        {
-            base.TestSortedSetFixedLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetVariableLengthVsStoredFields()
-        {
-            base.TestSortedSetVariableLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetFixedLengthSingleValuedVsStoredFields()
-        {
-            base.TestSortedSetFixedLengthSingleValuedVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetVariableLengthSingleValuedVsStoredFields()
-        {
-            base.TestSortedSetVariableLengthSingleValuedVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetFixedLengthVsUninvertedField()
-        {
-            base.TestSortedSetFixedLengthVsUninvertedField();
-        }
-
-        [Test]
-        public override void TestSortedSetVariableLengthVsUninvertedField()
-        {
-            base.TestSortedSetVariableLengthVsUninvertedField();
-        }
-
-        [Test]
-        public override void TestGCDCompression()
-        {
-            base.TestGCDCompression();
-        }
-
-        [Test]
-        public override void TestZeros()
-        {
-            base.TestZeros();
-        }
-
-        [Test]
-        public override void TestZeroOrMin()
-        {
-            base.TestZeroOrMin();
-        }
-
-        [Test]
-        public override void TestTwoNumbersOneMissing()
-        {
-            base.TestTwoNumbersOneMissing();
-        }
-
-        [Test]
-        public override void TestTwoNumbersOneMissingWithMerging()
-        {
-            base.TestTwoNumbersOneMissingWithMerging();
-        }
-
-        [Test]
-        public override void TestThreeNumbersOneMissingWithMerging()
-        {
-            base.TestThreeNumbersOneMissingWithMerging();
-        }
-
-        [Test]
-        public override void TestTwoBytesOneMissing()
-        {
-            base.TestTwoBytesOneMissing();
-        }
-
-        [Test]
-        public override void TestTwoBytesOneMissingWithMerging()
-        {
-            base.TestTwoBytesOneMissingWithMerging();
-        }
-
-        [Test]
-        public override void TestThreeBytesOneMissingWithMerging()
-        {
-            base.TestThreeBytesOneMissingWithMerging();
-        }
-
-        // LUCENE-4853
-        [Test]
-        public override void TestHugeBinaryValues()
-        {
-            base.TestHugeBinaryValues();
-        }
-
-        // TODO: get this out of here and into the deprecated codecs (4.0, 4.2)
-        [Test]
-        public override void TestHugeBinaryValueLimit()
-        {
-            base.TestHugeBinaryValueLimit();
-        }
-
-        /// <summary>
-        /// Tests dv against stored fields with threads (binary/numeric/sorted, no missing)
-        /// </summary>
-        [Test]
-        public override void TestThreads()
-        {
-            base.TestThreads();
-        }
-
-        /// <summary>
-        /// Tests dv against stored fields with threads (all types + missing)
-        /// </summary>
-        [Test]
-        public override void TestThreads2()
-        {
-            base.TestThreads2();
-        }
-
-        // LUCENE-5218
-        [Test]
-        public override void TestEmptyBinaryValueOnPageSizes()
-        {
-            base.TestEmptyBinaryValueOnPageSizes();
-        }
-
-        #endregion
-
-        #region BaseIndexFileFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestMergeStability()
-        {
-            base.TestMergeStability();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldPostingsFormat.cs b/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldPostingsFormat.cs
index 05751f9..d2275e8 100644
--- a/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldPostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Codecs/Perfield/TestPerFieldPostingsFormat.cs
@@ -45,56 +45,5 @@ namespace Lucene.Net.Codecs.Perfield
             //LUCENE TO-DO
             AssumeTrue("The MockRandom PF randomizes content on the fly, so we can't check it", false);
         }
-
-
-        #region BasePostingsFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestDocsOnly()
-        {
-            base.TestDocsOnly();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqs()
-        {
-            base.TestDocsAndFreqs();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositions()
-        {
-            base.TestDocsAndFreqsAndPositions();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositionsAndPayloads()
-        {
-            base.TestDocsAndFreqsAndPositionsAndPayloads();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositionsAndOffsets()
-        {
-            base.TestDocsAndFreqsAndPositionsAndOffsets();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositionsAndOffsetsAndPayloads()
-        {
-            base.TestDocsAndFreqsAndPositionsAndOffsetsAndPayloads();
-        }
-
-        [Test]
-        public override void TestRandom()
-        {
-            base.TestRandom();
-        }
-
-        #endregion
-
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs b/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
index 628ddc0..70ee586 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocValuesFormat.cs
@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -41,506 +39,5 @@ namespace Lucene.Net.Index
         {
             return TestUtil.FieldSupportsHugeBinaryDocValues(field);
         }
-
-
-        #region BaseDocValuesFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestOneNumber()
-        {
-            base.TestOneNumber();
-        }
-
-        [Test]
-        public override void TestOneFloat()
-        {
-            base.TestOneFloat();
-        }
-
-        [Test]
-        public override void TestTwoNumbers()
-        {
-            base.TestTwoNumbers();
-        }
-
-        [Test]
-        public override void TestTwoBinaryValues()
-        {
-            base.TestTwoBinaryValues();
-        }
-
-        [Test]
-        public override void TestTwoFieldsMixed()
-        {
-            base.TestTwoFieldsMixed();
-        }
-
-        [Test]
-        public override void TestThreeFieldsMixed()
-        {
-            base.TestThreeFieldsMixed();
-        }
-
-        [Test]
-        public override void TestThreeFieldsMixed2()
-        {
-            base.TestThreeFieldsMixed2();
-        }
-
-        [Test]
-        public override void TestTwoDocumentsNumeric()
-        {
-            base.TestTwoDocumentsNumeric();
-        }
-
-        [Test]
-        public override void TestTwoDocumentsMerged()
-        {
-            base.TestTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestBigNumericRange()
-        {
-            base.TestBigNumericRange();
-        }
-
-        [Test]
-        public override void TestBigNumericRange2()
-        {
-            base.TestBigNumericRange2();
-        }
-
-        [Test]
-        public override void TestBytes()
-        {
-            base.TestBytes();
-        }
-
-        [Test]
-        public override void TestBytesTwoDocumentsMerged()
-        {
-            base.TestBytesTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestSortedBytes()
-        {
-            base.TestSortedBytes();
-        }
-
-        [Test]
-        public override void TestSortedBytesTwoDocuments()
-        {
-            base.TestSortedBytesTwoDocuments();
-        }
-
-        [Test]
-        public override void TestSortedBytesThreeDocuments()
-        {
-            base.TestSortedBytesThreeDocuments();
-        }
-
-        [Test]
-        public override void TestSortedBytesTwoDocumentsMerged()
-        {
-            base.TestSortedBytesTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestSortedMergeAwayAllValues()
-        {
-            base.TestSortedMergeAwayAllValues();
-        }
-
-        [Test]
-        public override void TestBytesWithNewline()
-        {
-            base.TestBytesWithNewline();
-        }
-
-        [Test]
-        public override void TestMissingSortedBytes()
-        {
-            base.TestMissingSortedBytes();
-        }
-
-        [Test]
-        public override void TestSortedTermsEnum()
-        {
-            base.TestSortedTermsEnum();
-        }
-
-        [Test]
-        public override void TestEmptySortedBytes()
-        {
-            base.TestEmptySortedBytes();
-        }
-
-        [Test]
-        public override void TestEmptyBytes()
-        {
-            base.TestEmptyBytes();
-        }
-
-        [Test]
-        public override void TestVeryLargeButLegalBytes()
-        {
-            base.TestVeryLargeButLegalBytes();
-        }
-
-        [Test]
-        public override void TestVeryLargeButLegalSortedBytes()
-        {
-            base.TestVeryLargeButLegalSortedBytes();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnBytes()
-        {
-            base.TestCodecUsesOwnBytes();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnSortedBytes()
-        {
-            base.TestCodecUsesOwnSortedBytes();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnBytesEachTime()
-        {
-            base.TestCodecUsesOwnBytesEachTime();
-        }
-
-        [Test]
-        public override void TestCodecUsesOwnSortedBytesEachTime()
-        {
-            base.TestCodecUsesOwnSortedBytesEachTime();
-        }
-
-        /*
-         * Simple test case to show how to use the API
-         */
-        [Test]
-        public override void TestDocValuesSimple()
-        {
-            base.TestDocValuesSimple();
-        }
-
-        [Test]
-        public override void TestRandomSortedBytes()
-        {
-            base.TestRandomSortedBytes();
-        }
-
-        [Test]
-        public override void TestBooleanNumericsVsStoredFields()
-        {
-            base.TestBooleanNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestByteNumericsVsStoredFields()
-        {
-            base.TestByteNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestByteMissingVsFieldCache()
-        {
-            base.TestByteMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestShortNumericsVsStoredFields()
-        {
-            base.TestShortNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestShortMissingVsFieldCache()
-        {
-            base.TestShortMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestIntNumericsVsStoredFields()
-        {
-            base.TestIntNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestIntMissingVsFieldCache()
-        {
-            base.TestIntMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestLongNumericsVsStoredFields()
-        {
-            base.TestLongNumericsVsStoredFields();
-        }
-
-        [Test]
-        public override void TestLongMissingVsFieldCache()
-        {
-            base.TestLongMissingVsFieldCache();
-        }
-
-        [Test]
-        public override void TestBinaryFixedLengthVsStoredFields()
-        {
-            base.TestBinaryFixedLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestBinaryVariableLengthVsStoredFields()
-        {
-            base.TestBinaryVariableLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedFixedLengthVsStoredFields()
-        {
-            base.TestSortedFixedLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedFixedLengthVsFieldCache()
-        {
-            base.TestSortedFixedLengthVsFieldCache();
-        }
-
-        [Test]
-        public override void TestSortedVariableLengthVsFieldCache()
-        {
-            base.TestSortedVariableLengthVsFieldCache();
-        }
-
-        [Test]
-        public override void TestSortedVariableLengthVsStoredFields()
-        {
-            base.TestSortedVariableLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetOneValue()
-        {
-            base.TestSortedSetOneValue();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoFields()
-        {
-            base.TestSortedSetTwoFields();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsMerged()
-        {
-            base.TestSortedSetTwoDocumentsMerged();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoValues()
-        {
-            base.TestSortedSetTwoValues();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoValuesUnordered()
-        {
-            base.TestSortedSetTwoValuesUnordered();
-        }
-
-        [Test]
-        public override void TestSortedSetThreeValuesTwoDocs()
-        {
-            base.TestSortedSetThreeValuesTwoDocs();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsLastMissing()
-        {
-            base.TestSortedSetTwoDocumentsLastMissing();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsLastMissingMerge()
-        {
-            base.TestSortedSetTwoDocumentsLastMissingMerge();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsFirstMissing()
-        {
-            base.TestSortedSetTwoDocumentsFirstMissing();
-        }
-
-        [Test]
-        public override void TestSortedSetTwoDocumentsFirstMissingMerge()
-        {
-            base.TestSortedSetTwoDocumentsFirstMissingMerge();
-        }
-
-        [Test]
-        public override void TestSortedSetMergeAwayAllValues()
-        {
-            base.TestSortedSetMergeAwayAllValues();
-        }
-
-        [Test]
-        public override void TestSortedSetTermsEnum()
-        {
-            base.TestSortedSetTermsEnum();
-        }
-
-        [Test]
-        public override void TestSortedSetFixedLengthVsStoredFields()
-        {
-            base.TestSortedSetFixedLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetVariableLengthVsStoredFields()
-        {
-            base.TestSortedSetVariableLengthVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetFixedLengthSingleValuedVsStoredFields()
-        {
-            base.TestSortedSetFixedLengthSingleValuedVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetVariableLengthSingleValuedVsStoredFields()
-        {
-            base.TestSortedSetVariableLengthSingleValuedVsStoredFields();
-        }
-
-        [Test]
-        public override void TestSortedSetFixedLengthVsUninvertedField()
-        {
-            base.TestSortedSetFixedLengthVsUninvertedField();
-        }
-
-        [Test]
-        public override void TestSortedSetVariableLengthVsUninvertedField()
-        {
-            base.TestSortedSetVariableLengthVsUninvertedField();
-        }
-
-        [Test]
-        public override void TestGCDCompression()
-        {
-            base.TestGCDCompression();
-        }
-
-        [Test]
-        public override void TestZeros()
-        {
-            base.TestZeros();
-        }
-
-        [Test]
-        public override void TestZeroOrMin()
-        {
-            base.TestZeroOrMin();
-        }
-
-        [Test]
-        public override void TestTwoNumbersOneMissing()
-        {
-            base.TestTwoNumbersOneMissing();
-        }
-
-        [Test]
-        public override void TestTwoNumbersOneMissingWithMerging()
-        {
-            base.TestTwoNumbersOneMissingWithMerging();
-        }
-
-        [Test]
-        public override void TestThreeNumbersOneMissingWithMerging()
-        {
-            base.TestThreeNumbersOneMissingWithMerging();
-        }
-
-        [Test]
-        public override void TestTwoBytesOneMissing()
-        {
-            base.TestTwoBytesOneMissing();
-        }
-
-        [Test]
-        public override void TestTwoBytesOneMissingWithMerging()
-        {
-            base.TestTwoBytesOneMissingWithMerging();
-        }
-
-        [Test]
-        public override void TestThreeBytesOneMissingWithMerging()
-        {
-            base.TestThreeBytesOneMissingWithMerging();
-        }
-
-        // LUCENE-4853
-        [Test]
-        public override void TestHugeBinaryValues()
-        {
-            base.TestHugeBinaryValues();
-        }
-
-        // TODO: get this out of here and into the deprecated codecs (4.0, 4.2)
-        [Test]
-        public override void TestHugeBinaryValueLimit()
-        {
-            base.TestHugeBinaryValueLimit();
-        }
-
-        /// <summary>
-        /// Tests dv against stored fields with threads (binary/numeric/sorted, no missing)
-        /// </summary>
-        [Test]
-        public override void TestThreads()
-        {
-            base.TestThreads();
-        }
-
-        /// <summary>
-        /// Tests dv against stored fields with threads (all types + missing)
-        /// </summary>
-        [Test]
-        public override void TestThreads2()
-        {
-            base.TestThreads2();
-        }
-
-        // LUCENE-5218
-        [Test]
-        public override void TestEmptyBinaryValueOnPageSizes()
-        {
-            base.TestEmptyBinaryValueOnPageSizes();
-        }
-
-        #endregion
-
-        #region BaseIndexFileFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestMergeStability()
-        {
-            base.TestMergeStability();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs b/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
index 921b719..e99678b 100644
--- a/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestLogMergePolicy.cs
@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -25,18 +23,5 @@ namespace Lucene.Net.Index
         {
             return NewLogMergePolicy(Random());
         }
-
-        #region BaseMergePolicyTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestForceMergeNotNeeded()
-        {
-            base.TestForceMergeNotNeeded();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs b/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
index c48b98f..7f425f7 100644
--- a/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestNumericDocValuesUpdates.cs
@@ -1527,7 +1527,7 @@ namespace Lucene.Net.Index
             dir.Dispose();
         }
 
-        [Test, Timeout(120000)]
+        [Test]
         public virtual void TestTonsOfUpdates()
         {
             // LUCENE-5248: make sure that when there are many updates, we don't use too much RAM

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs b/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
index 7d49c1b..70c47cc 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPersistentSnapshotDeletionPolicy.cs
@@ -208,55 +208,5 @@ namespace Lucene.Net.Index
             Assert.AreEqual(0, psdp.SnapshotCount, "Should have no snapshots !");
             dir.Dispose();
         }
-
-
-        #region TestSnapshotDeletionPolicy
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestSnapshotDeletionPolicy_Mem()
-        {
-            base.TestSnapshotDeletionPolicy_Mem();
-        }
-
-        [Test]
-        public override void TestBasicSnapshots()
-        {
-            base.TestBasicSnapshots();
-        }
-
-        [Test]
-        public override void TestMultiThreadedSnapshotting()
-        {
-            base.TestMultiThreadedSnapshotting();
-        }
-
-        [Test]
-        public override void TestRollbackToOldSnapshot()
-        {
-            base.TestRollbackToOldSnapshot();
-        }
-
-        [Test]
-        public override void TestReleaseSnapshot()
-        {
-            base.TestReleaseSnapshot();
-        }
-
-        [Test]
-        public override void TestSnapshotLastCommitTwice()
-        {
-            base.TestSnapshotLastCommitTwice();
-        }
-
-        [Test]
-        public override void TestMissingCommits()
-        {
-            base.TestMissingCommits();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestPostingsFormat.cs b/src/Lucene.Net.Tests/core/Index/TestPostingsFormat.cs
index 20c6b07..427aa96 100644
--- a/src/Lucene.Net.Tests/core/Index/TestPostingsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestPostingsFormat.cs
@@ -41,55 +41,5 @@ namespace Lucene.Net.Index
         {
             AssumeTrue("The MockRandom PF randomizes content on the fly, so we can't check it", false);
         }
-
-
-        #region BasePostingsFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestDocsOnly()
-        {
-            base.TestDocsOnly();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqs()
-        {
-            base.TestDocsAndFreqs();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositions()
-        {
-            base.TestDocsAndFreqsAndPositions();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositionsAndPayloads()
-        {
-            base.TestDocsAndFreqsAndPositionsAndPayloads();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositionsAndOffsets()
-        {
-            base.TestDocsAndFreqsAndPositionsAndOffsets();
-        }
-
-        [Test]
-        public override void TestDocsAndFreqsAndPositionsAndOffsetsAndPayloads()
-        {
-            base.TestDocsAndFreqsAndPositionsAndOffsetsAndPayloads();
-        }
-
-        [Test]
-        public override void TestRandom()
-        {
-            base.TestRandom();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs b/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
index 31ed10c..902db7f 100644
--- a/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestStoredFieldsFormat.cs
@@ -47,88 +47,5 @@ namespace Lucene.Net.Index
             // and merge into newly formed 3.x segments.
             base.TestWriteReadMerge();
         }
-
-
-        #region BaseStoredFieldsFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestRandomStoredFields()
-        {
-            base.TestRandomStoredFields();
-        }
-
-        [Test]
-        // LUCENE-1727: make sure doc fields are stored in order
-        public override void TestStoredFieldsOrder()
-        {
-            base.TestStoredFieldsOrder();
-        }
-
-        [Test]
-        // LUCENE-1219
-        public override void TestBinaryFieldOffsetLength()
-        {
-            base.TestBinaryFieldOffsetLength();
-        }
-
-        [Test]
-        public override void TestNumericField()
-        {
-            base.TestNumericField();
-        }
-
-        [Test]
-        public override void TestIndexedBit()
-        {
-            base.TestIndexedBit();
-        }
-
-        [Test]
-        public override void TestReadSkip()
-        {
-            base.TestReadSkip();
-        }
-
-        [Test]
-        public override void TestEmptyDocs()
-        {
-            base.TestEmptyDocs();
-        }
-
-        [Test]
-        public override void TestConcurrentReads()
-        {
-            base.TestConcurrentReads();
-        }
-
-        [Test, Timeout(120000)]
-        public override void TestBigDocuments()
-        {
-            base.TestBigDocuments();
-        }
-
-        [Test]
-        public override void TestBulkMergeWithDeletes()
-        {
-            base.TestBulkMergeWithDeletes();
-        }
-
-        #endregion
-
-        #region BaseIndexFileFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestMergeStability()
-        {
-            base.TestMergeStability();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs b/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
index dac8fa8..38f08d4 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTermVectorsFormat.cs
@@ -58,60 +58,5 @@ namespace Lucene.Net.Index
         {
             AssumeTrue("The MockRandom PF randomizes content on the fly, so we can't check it", false);
         }
-
-
-
-        #region BaseTermVectorsFormatTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        // only one doc with vectors
-        public override void TestRareVectors()
-        {
-            base.TestRareVectors();
-        }
-
-        [Test]
-        public override void TestHighFreqs()
-        {
-            base.TestHighFreqs();
-        }
-
-        [Test]
-        public override void TestLotsOfFields()
-        {
-            base.TestLotsOfFields();
-        }
-
-        [Test]
-        // different options for the same field
-        public override void TestMixedOptions()
-        {
-            base.TestMixedOptions();
-        }
-
-        [Test]
-        public override void TestRandom()
-        {
-            base.TestRandom();
-        }
-
-        [Test]
-        public override void TestMerge()
-        {
-            base.TestMerge();
-        }
-
-        [Test]
-        // run random tests from different threads to make sure the per-thread clones
-        // don't share mutable data
-        public override void TestClone()
-        {
-            base.TestClone();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs b/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
index ede9691..922551c 100644
--- a/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestTieredMergePolicy.cs
@@ -273,19 +273,5 @@ namespace Lucene.Net.Index
 
             // TODO: Add more checks for other non-double setters!
         }
-
-
-        #region BaseMergePolicyTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestForceMergeNotNeeded()
-        {
-            base.TestForceMergeNotNeeded();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/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 16a6d17..96ec2f4 100644
--- a/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/BaseTestRangeFilter.cs
@@ -192,7 +192,7 @@ namespace Lucene.Net.Search
             }
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestPad()
         {
             int[] tests = new int[] { -9999999, -99560, -100, -3, -1, 0, 3, 9, 10, 1000, 999999999 };

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Search/Spans/TestSpanExplanationsOfNonMatches.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanExplanationsOfNonMatches.cs b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanExplanationsOfNonMatches.cs
index 307c51f..735dc0c 100644
--- a/src/Lucene.Net.Tests/core/Search/Spans/TestSpanExplanationsOfNonMatches.cs
+++ b/src/Lucene.Net.Tests/core/Search/Spans/TestSpanExplanationsOfNonMatches.cs
@@ -33,219 +33,5 @@ namespace Lucene.Net.Search.Spans
         {
             CheckHits.CheckNoMatchExplanations(q, FIELD, Searcher, expDocNrs);
         }
-
-
-        #region TestSpanExplanations
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestST1()
-        {
-            base.TestST1();
-        }
-
-        [Test]
-        public override void TestST2()
-        {
-            base.TestST2();
-        }
-
-        [Test]
-        public override void TestST4()
-        {
-            base.TestST4();
-        }
-
-        [Test]
-        public override void TestST5()
-        {
-            base.TestST5();
-        }
-
-        /* some SpanFirstQueries */
-
-        [Test]
-        public override void TestSF1()
-        {
-            base.TestSF1();
-        }
-
-        [Test]
-        public override void TestSF2()
-        {
-            base.TestSF2();
-        }
-
-        [Test]
-        public override void TestSF4()
-        {
-            base.TestSF4();
-        }
-
-        [Test]
-        public override void TestSF5()
-        {
-            base.TestSF5();
-        }
-
-        [Test]
-        public override void TestSF6()
-        {
-            base.TestSF6();
-        }
-
-        /* some SpanOrQueries */
-
-        [Test]
-        public override void TestSO1()
-        {
-            base.TestSO1();
-        }
-
-        [Test]
-        public override void TestSO2()
-        {
-            base.TestSO2();
-        }
-
-        [Test]
-        public override void TestSO3()
-        {
-            base.TestSO3();
-        }
-
-        [Test]
-        public override void TestSO4()
-        {
-            base.TestSO4();
-        }
-
-        /* some SpanNearQueries */
-
-        [Test]
-        public override void TestSNear1()
-        {
-            base.TestSNear1();
-        }
-
-        [Test]
-        public override void TestSNear2()
-        {
-            base.TestSNear2();
-        }
-
-        [Test]
-        public override void TestSNear3()
-        {
-            base.TestSNear3();
-        }
-
-        [Test]
-        public override void TestSNear4()
-        {
-            base.TestSNear4();
-        }
-
-        [Test]
-        public override void TestSNear5()
-        {
-            base.TestSNear5();
-        }
-
-        [Test]
-        public override void TestSNear6()
-        {
-            base.TestSNear6();
-        }
-
-        [Test]
-        public override void TestSNear7()
-        {
-            base.TestSNear7();
-        }
-
-        [Test]
-        public override void TestSNear8()
-        {
-            base.TestSNear8();
-        }
-
-        [Test]
-        public override void TestSNear9()
-        {
-            base.TestSNear9();
-        }
-
-        [Test]
-        public override void TestSNear10()
-        {
-            base.TestSNear10();
-        }
-
-        [Test]
-        public override void TestSNear11()
-        {
-            base.TestSNear11();
-        }
-
-        /* some SpanNotQueries */
-
-        [Test]
-        public override void TestSNot1()
-        {
-            base.TestSNot1();
-        }
-
-        [Test]
-        public override void TestSNot2()
-        {
-            base.TestSNot2();
-        }
-
-        [Test]
-        public override void TestSNot4()
-        {
-            base.TestSNot4();
-        }
-
-        [Test]
-        public override void TestSNot5()
-        {
-            base.TestSNot5();
-        }
-
-        [Test]
-        public override void TestSNot7()
-        {
-            base.TestSNot7();
-        }
-
-        [Test]
-        public override void TestSNot10()
-        {
-            base.TestSNot10();
-        }
-
-        #endregion
-
-        #region TestExplanations
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-
-        /// <summary>
-        /// Placeholder: JUnit freaks if you don't have one test ... making
-        /// class abstract doesn't help
-        /// </summary>
-        [Test]
-        public override void TestNoop()
-        {
-            base.TestNoop();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Search/TestComplexExplanationsOfNonMatches.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestComplexExplanationsOfNonMatches.cs b/src/Lucene.Net.Tests/core/Search/TestComplexExplanationsOfNonMatches.cs
index 18a2759..fbfe049 100644
--- a/src/Lucene.Net.Tests/core/Search/TestComplexExplanationsOfNonMatches.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestComplexExplanationsOfNonMatches.cs
@@ -33,165 +33,5 @@ namespace Lucene.Net.Search
         {
             CheckHits.CheckNoMatchExplanations(q, FIELD, Searcher, expDocNrs);
         }
-
-
-        #region TestComplexExplanations
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void Test1()
-        {
-            base.Test1();
-        }
-
-        [Test]
-        public override void Test2()
-        {
-            base.Test2();
-        }
-
-        // :TODO: we really need more crazy complex cases.
-
-        // //////////////////////////////////////////////////////////////////
-
-        // The rest of these aren't that complex, but they are <i>somewhat</i>
-        // complex, and they expose weakness in dealing with queries that match
-        // with scores of 0 wrapped in other queries
-
-        [Test]
-        public override void TestT3()
-        {
-            base.TestT3();
-        }
-
-        [Test]
-        public override void TestMA3()
-        {
-            base.TestMA3();
-        }
-
-        [Test]
-        public override void TestFQ5()
-        {
-            base.TestFQ5();
-        }
-
-        [Test]
-        public override void TestCSQ4()
-        {
-            base.TestCSQ4();
-        }
-
-        [Test]
-        public override void TestDMQ10()
-        {
-            base.TestDMQ10();
-        }
-
-        [Test]
-        public override void TestMPQ7()
-        {
-            base.TestMPQ7();
-        }
-
-        [Test]
-        public override void TestBQ12()
-        {
-            base.TestBQ12();
-        }
-
-        [Test]
-        public override void TestBQ13()
-        {
-            base.TestBQ13();
-        }
-
-        [Test]
-        public override void TestBQ18()
-        {
-            base.TestBQ18();
-        }
-
-        [Test]
-        public override void TestBQ21()
-        {
-            base.TestBQ21();
-        }
-
-        [Test]
-        public override void TestBQ22()
-        {
-            base.TestBQ22();
-        }
-
-        [Test]
-        public override void TestST3()
-        {
-            base.TestST3();
-        }
-
-        [Test]
-        public override void TestST6()
-        {
-            base.TestST6();
-        }
-
-        [Test]
-        public override void TestSF3()
-        {
-            base.TestSF3();
-        }
-
-        [Test]
-        public override void TestSF7()
-        {
-            base.TestSF7();
-        }
-
-        [Test]
-        public override void TestSNot3()
-        {
-            base.TestSNot3();
-        }
-
-        [Test]
-        public override void TestSNot6()
-        {
-            base.TestSNot6();
-        }
-
-        [Test]
-        public override void TestSNot8()
-        {
-            base.TestSNot8();
-        }
-
-        [Test]
-        public override void TestSNot9()
-        {
-            base.TestSNot9();
-        }
-
-        #endregion
-
-        #region TestExplanations
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-
-        /// <summary>
-        /// Placeholder: JUnit freaks if you don't have one test ... making
-        /// class abstract doesn't help
-        /// </summary>
-        [Test]
-        public override void TestNoop()
-        {
-            base.TestNoop();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/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 18962f9..a528615 100644
--- a/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestExplanations.cs
@@ -261,7 +261,7 @@ namespace Lucene.Net.Search
         /// Placeholder: JUnit freaks if you don't have one test ... making
         /// class abstract doesn't help
         /// </summary>
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestNoop()
         {
             /* NOOP */

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
index 0a8452b..1acffbd 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCacheRangeFilter.cs
@@ -566,19 +566,5 @@ namespace Lucene.Net.Search
             reader.Dispose();
             dir.Dispose();
         }
-
-
-        #region SorterTestBase
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestPad()
-        {
-            base.TestPad();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Search/TestFieldCacheRewriteMethod.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestFieldCacheRewriteMethod.cs b/src/Lucene.Net.Tests/core/Search/TestFieldCacheRewriteMethod.cs
index 1b923a3..0fc6843 100644
--- a/src/Lucene.Net.Tests/core/Search/TestFieldCacheRewriteMethod.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestFieldCacheRewriteMethod.cs
@@ -60,22 +60,5 @@ namespace Lucene.Net.Search
             Assert.IsFalse(a1.Equals(b));
             QueryUtils.Check(a1);
         }
-
-
-
-        #region TestSnapshotDeletionPolicy
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// test a bunch of random regular expressions </summary>
-        [Test, Timeout(60000)]
-        public override void TestRegexps()
-        {
-            base.TestRegexps();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/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 7f95d2a..f52d360 100644
--- a/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestMultiTermConstantScore.cs
@@ -551,19 +551,5 @@ namespace Lucene.Net.Search
             result = search.Search(Csrq("rand", maxRP, null, T, F), null, numDocs).ScoreDocs;
             AssertEquals("max,nul,T,T", 1, result.Length);
         }
-
-
-        #region SorterTestBase
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestPad()
-        {
-            base.TestPad();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Search/TestSimpleExplanationsOfNonMatches.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSimpleExplanationsOfNonMatches.cs b/src/Lucene.Net.Tests/core/Search/TestSimpleExplanationsOfNonMatches.cs
index ee990c1..6b45673 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSimpleExplanationsOfNonMatches.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSimpleExplanationsOfNonMatches.cs
@@ -33,457 +33,5 @@ namespace Lucene.Net.Search
         {
             CheckHits.CheckNoMatchExplanations(q, FIELD, Searcher, expDocNrs);
         }
-
-
-        #region TestSimpleExplanations
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestT1()
-        {
-            base.TestT1();
-        }
-
-        [Test]
-        public override void TestT2()
-        {
-            base.TestT2();
-        }
-
-        /* MatchAllDocs */
-
-        [Test]
-        public override void TestMA1()
-        {
-            base.TestMA1();
-        }
-
-        [Test]
-        public override void TestMA2()
-        {
-            base.TestMA2();
-        }
-
-        /* some simple phrase tests */
-
-        [Test]
-        public override void TestP1()
-        {
-            base.TestP1();
-        }
-
-        [Test]
-        public override void TestP2()
-        {
-            base.TestP2();
-        }
-
-        [Test]
-        public override void TestP3()
-        {
-            base.TestP3();
-        }
-
-        [Test]
-        public override void TestP4()
-        {
-            base.TestP4();
-        }
-
-        [Test]
-        public override void TestP5()
-        {
-            base.TestP5();
-        }
-
-        [Test]
-        public override void TestP6()
-        {
-            base.TestP6();
-        }
-
-        [Test]
-        public override void TestP7()
-        {
-            base.TestP7();
-        }
-
-        /* some simple filtered query tests */
-
-        [Test]
-        public override void TestFQ1()
-        {
-            base.TestFQ1();
-        }
-
-        [Test]
-        public override void TestFQ2()
-        {
-            base.TestFQ2();
-        }
-
-        [Test]
-        public override void TestFQ3()
-        {
-            base.TestFQ3();
-        }
-
-        [Test]
-        public override void TestFQ4()
-        {
-            base.TestFQ4();
-        }
-
-        [Test]
-        public override void TestFQ6()
-        {
-            base.TestFQ6();
-        }
-
-        /* ConstantScoreQueries */
-
-        [Test]
-        public override void TestCSQ1()
-        {
-            base.TestCSQ1();
-        }
-
-        [Test]
-        public override void TestCSQ2()
-        {
-            base.TestCSQ2();
-        }
-
-        [Test]
-        public override void TestCSQ3()
-        {
-            base.TestCSQ3();
-        }
-
-        /* DisjunctionMaxQuery */
-
-        [Test]
-        public override void TestDMQ1()
-        {
-            base.TestDMQ1();
-        }
-
-        [Test]
-        public override void TestDMQ2()
-        {
-            base.TestDMQ2();
-        }
-
-        [Test]
-        public override void TestDMQ3()
-        {
-            base.TestDMQ3();
-        }
-
-        [Test]
-        public override void TestDMQ4()
-        {
-            base.TestDMQ4();
-        }
-
-        [Test]
-        public override void TestDMQ5()
-        {
-            base.TestDMQ5();
-        }
-
-        [Test]
-        public override void TestDMQ6()
-        {
-            base.TestDMQ6();
-        }
-
-        [Test]
-        public override void TestDMQ7()
-        {
-            base.TestDMQ7();
-        }
-
-        [Test]
-        public override void TestDMQ8()
-        {
-            base.TestDMQ8();
-        }
-
-        [Test]
-        public override void TestDMQ9()
-        {
-            base.TestDMQ9();
-        }
-
-        /* MultiPhraseQuery */
-
-        [Test]
-        public override void TestMPQ1()
-        {
-            base.TestMPQ1();
-        }
-
-        [Test]
-        public override void TestMPQ2()
-        {
-            base.TestMPQ2();
-        }
-
-        [Test]
-        public override void TestMPQ3()
-        {
-            base.TestMPQ3();
-        }
-
-        [Test]
-        public override void TestMPQ4()
-        {
-            base.TestMPQ4();
-        }
-
-        [Test]
-        public override void TestMPQ5()
-        {
-            base.TestMPQ5();
-        }
-
-        [Test]
-        public override void TestMPQ6()
-        {
-            base.TestMPQ6();
-        }
-
-        /* some simple tests of boolean queries containing term queries */
-
-        [Test]
-        public override void TestBQ1()
-        {
-            base.TestBQ1();
-        }
-
-        [Test]
-        public override void TestBQ2()
-        {
-            base.TestBQ2();
-        }
-
-        [Test]
-        public override void TestBQ3()
-        {
-            base.TestBQ3();
-        }
-
-        [Test]
-        public override void TestBQ4()
-        {
-            base.TestBQ4();
-        }
-
-        [Test]
-        public override void TestBQ5()
-        {
-            base.TestBQ5();
-        }
-
-        [Test]
-        public override void TestBQ6()
-        {
-            base.TestBQ6();
-        }
-
-        [Test]
-        public override void TestBQ7()
-        {
-            base.TestBQ7();
-        }
-
-        [Test]
-        public override void TestBQ8()
-        {
-            base.TestBQ8();
-        }
-
-        [Test]
-        public override void TestBQ9()
-        {
-            base.TestBQ9();
-        }
-
-        [Test]
-        public override void TestBQ10()
-        {
-            base.TestBQ10();
-        }
-
-        [Test]
-        public override void TestBQ11()
-        {
-            base.TestBQ11();
-        }
-
-        [Test]
-        public override void TestBQ14()
-        {
-            base.TestBQ14();
-        }
-
-        [Test]
-        public override void TestBQ15()
-        {
-            base.TestBQ15();
-        }
-
-        [Test]
-        public override void TestBQ16()
-        {
-            base.TestBQ16();
-        }
-
-        [Test]
-        public override void TestBQ17()
-        {
-            base.TestBQ17();
-        }
-
-        [Test]
-        public override void TestBQ19()
-        {
-            base.TestBQ19();
-        }
-
-        [Test]
-        public override void TestBQ20()
-        {
-            base.TestBQ20();
-        }
-
-        /* BQ of TQ: using alt so some fields have zero boost and some don't */
-
-        [Test]
-        public override void TestMultiFieldBQ1()
-        {
-            base.TestMultiFieldBQ1();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ2()
-        {
-            base.TestMultiFieldBQ2();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ3()
-        {
-            base.TestMultiFieldBQ3();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ4()
-        {
-            base.TestMultiFieldBQ4();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ5()
-        {
-            base.TestMultiFieldBQ5();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ6()
-        {
-            base.TestMultiFieldBQ6();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ7()
-        {
-            base.TestMultiFieldBQ7();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ8()
-        {
-            base.TestMultiFieldBQ8();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ9()
-        {
-            base.TestMultiFieldBQ9();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQ10()
-        {
-            base.TestMultiFieldBQ10();
-        }
-
-        /* BQ of PQ: using alt so some fields have zero boost and some don't */
-
-        [Test]
-        public override void TestMultiFieldBQofPQ1()
-        {
-            base.TestMultiFieldBQofPQ1();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQofPQ2()
-        {
-            base.TestMultiFieldBQofPQ2();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQofPQ3()
-        {
-            base.TestMultiFieldBQofPQ3();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQofPQ4()
-        {
-            base.TestMultiFieldBQofPQ4();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQofPQ5()
-        {
-            base.TestMultiFieldBQofPQ5();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQofPQ6()
-        {
-            base.TestMultiFieldBQofPQ6();
-        }
-
-        [Test]
-        public override void TestMultiFieldBQofPQ7()
-        {
-            base.TestMultiFieldBQofPQ7();
-        }
-
-        #endregion
-
-        #region TestExplanations
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-
-        /// <summary>
-        /// Placeholder: JUnit freaks if you don't have one test ... making
-        /// class abstract doesn't help
-        /// </summary>
-        [Test]
-        public override void TestNoop()
-        {
-            base.TestNoop();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Search/TestTermRangeFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTermRangeFilter.cs b/src/Lucene.Net.Tests/core/Search/TestTermRangeFilter.cs
index f8c9fb3..bb1c4d0 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTermRangeFilter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTermRangeFilter.cs
@@ -177,19 +177,5 @@ namespace Lucene.Net.Search
             result = search.Search(q, TermRangeFilter.NewStringRange("rand", maxRP, null, T, F), numDocs).ScoreDocs;
             Assert.AreEqual(1, result.Length, "max,nul,T,T");
         }
-
-
-        #region SorterTestBase
-        // LUCENENET NOTE: Tests in a base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestPad()
-        {
-            base.TestPad();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/BaseSortTestCase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/BaseSortTestCase.cs b/src/Lucene.Net.Tests/core/Util/BaseSortTestCase.cs
index 51ac7e2..dd31909 100644
--- a/src/Lucene.Net.Tests/core/Util/BaseSortTestCase.cs
+++ b/src/Lucene.Net.Tests/core/Util/BaseSortTestCase.cs
@@ -153,55 +153,55 @@ namespace Lucene.Net.Util
             DoTest(strategy, Random().Next(20000));
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestEmpty()
         {
             SortTest(new Entry[0]);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestOne()
         {
             DoTest(RandomStrategy, 1);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestTwo()
         {
             DoTest(RandomStrategy, 2);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestRandom()
         {
             DoTest(RandomStrategy);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestRandomLowCardinality()
         {
             DoTest(RandomLowCardinalityStrategy, 2);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestAscending()
         {
             DoTest(AscendingStrategy, 2);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestAscendingSequences()
         {
             DoTest(AscendingSequencesStrategy, 2);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestDescending()
         {
             DoTest(DescendingStrategy, 2);
         }
 
-        // [Test] // LUCENENET NOTE: For now, we are overriding this test in every subclass to pull it into the right context for the subclass
+        [Test]
         public virtual void TestStrictlyDescendingStrategy()
         {
             DoTest(StrictlyDescendingStrategy, 2);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/Packed/TestEliasFanoDocIdSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/Packed/TestEliasFanoDocIdSet.cs b/src/Lucene.Net.Tests/core/Util/Packed/TestEliasFanoDocIdSet.cs
index 38d63a1..91c7062 100644
--- a/src/Lucene.Net.Tests/core/Util/Packed/TestEliasFanoDocIdSet.cs
+++ b/src/Lucene.Net.Tests/core/Util/Packed/TestEliasFanoDocIdSet.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using NUnit.Framework;
 using System.Collections;
 using System.Diagnostics;
 
@@ -76,49 +75,5 @@ namespace Lucene.Net.Util.Packed
                 return SlowAdvance(target);
             }
         }
-
-
-        #region BaseDocIdSetTestCase<T>
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// Test length=0.
-        /// </summary>
-        [Test]
-        public override void TestNoBit()
-        {
-            base.TestNoBit();
-        }
-
-        /// <summary>
-        /// Test length=1.
-        /// </summary>
-        [Test]
-        public override void Test1Bit()
-        {
-            base.Test1Bit();
-        }
-
-        /// <summary>
-        /// Test length=2.
-        /// </summary>
-        [Test]
-        public override void Test2Bits()
-        {
-            base.Test2Bits();
-        }
-
-        /// <summary>
-        /// Compare the content of the set against a <seealso cref="BitSet"/>.
-        /// </summary>
-        [Test]
-        public override void TestAgainstBitSet()
-        {
-            base.TestAgainstBitSet();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestDocIdBitSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestDocIdBitSet.cs b/src/Lucene.Net.Tests/core/Util/TestDocIdBitSet.cs
index bb779c5..1294bff 100644
--- a/src/Lucene.Net.Tests/core/Util/TestDocIdBitSet.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestDocIdBitSet.cs
@@ -1,5 +1,3 @@
-using Lucene.Net.Attributes;
-using NUnit.Framework;
 using System.Collections;
 
 namespace Lucene.Net.Util
@@ -27,49 +25,5 @@ namespace Lucene.Net.Util
         {
             return new DocIdBitSet((BitArray)bs.Clone());
         }
-
-
-        #region BaseDocIdSetTestCase<T>
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// Test length=0.
-        /// </summary>
-        [Test]
-        public override void TestNoBit()
-        {
-            base.TestNoBit();
-        }
-
-        /// <summary>
-        /// Test length=1.
-        /// </summary>
-        [Test]
-        public override void Test1Bit()
-        {
-            base.Test1Bit();
-        }
-
-        /// <summary>
-        /// Test length=2.
-        /// </summary>
-        [Test]
-        public override void Test2Bits()
-        {
-            base.Test2Bits();
-        }
-
-        /// <summary>
-        /// Compare the content of the set against a <seealso cref="BitSet"/>.
-        /// </summary>
-        [Test, LongRunningTest, Timeout(150000)]
-        public override void TestAgainstBitSet()
-        {
-            base.TestAgainstBitSet();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestFixedBitSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestFixedBitSet.cs b/src/Lucene.Net.Tests/core/Util/TestFixedBitSet.cs
index 2f822f9..550b3e1 100644
--- a/src/Lucene.Net.Tests/core/Util/TestFixedBitSet.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestFixedBitSet.cs
@@ -1,5 +1,4 @@
 using System;
-using Lucene.Net.Attributes;
 using Lucene.Net.Randomized.Generators;
 using Lucene.Net.Support;
 using NUnit.Framework;
@@ -511,49 +510,5 @@ namespace Lucene.Net.Util
             Assert.IsTrue(bits.Get(1));
             Assert.IsFalse(newBits.Get(1));
         }
-
-
-        #region BaseDocIdSetTestCase<T>
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// Test length=0.
-        /// </summary>
-        [Test]
-        public override void TestNoBit()
-        {
-            base.TestNoBit();
-        }
-
-        /// <summary>
-        /// Test length=1.
-        /// </summary>
-        [Test]
-        public override void Test1Bit()
-        {
-            base.Test1Bit();
-        }
-
-        /// <summary>
-        /// Test length=2.
-        /// </summary>
-        [Test]
-        public override void Test2Bits()
-        {
-            base.Test2Bits();
-        }
-
-        /// <summary>
-        /// Compare the content of the set against a <seealso cref="BitSet"/>.
-        /// </summary>
-        [Test, LongRunningTest, Timeout(150000)]
-        public override void TestAgainstBitSet()
-        {
-            base.TestAgainstBitSet();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestInPlaceMergeSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestInPlaceMergeSorter.cs b/src/Lucene.Net.Tests/core/Util/TestInPlaceMergeSorter.cs
index 3649531..5c35706 100644
--- a/src/Lucene.Net.Tests/core/Util/TestInPlaceMergeSorter.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestInPlaceMergeSorter.cs
@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace Lucene.Net.Util
 {
     /*
@@ -34,67 +32,5 @@ namespace Lucene.Net.Util
         {
             return new ArrayInPlaceMergeSorter<Entry>(arr, ArrayUtil.naturalComparator<Entry>());
         }
-
-
-        #region BaseSortTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestEmpty()
-        {
-            base.TestEmpty();
-        }
-
-        [Test]
-        public override void TestOne()
-        {
-            base.TestOne();
-        }
-
-        [Test]
-        public override void TestTwo()
-        {
-            base.TestTwo();
-        }
-
-        [Test]
-        public override void TestRandom()
-        {
-            base.TestRandom();
-        }
-
-        [Test]
-        public override void TestRandomLowCardinality()
-        {
-            base.TestRandomLowCardinality();
-        }
-
-        [Test]
-        public override void TestAscending()
-        {
-            base.TestAscending();
-        }
-
-        [Test]
-        public override void TestAscendingSequences()
-        {
-            base.TestAscendingSequences();
-        }
-
-        [Test]
-        public override void TestDescending()
-        {
-            base.TestDescending();
-        }
-
-        [Test]
-        public override void TestStrictlyDescendingStrategy()
-        {
-            base.TestStrictlyDescendingStrategy();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestIntroSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestIntroSorter.cs b/src/Lucene.Net.Tests/core/Util/TestIntroSorter.cs
index b2c75f8..c71893a 100644
--- a/src/Lucene.Net.Tests/core/Util/TestIntroSorter.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestIntroSorter.cs
@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace Lucene.Net.Util
 {
     /*
@@ -30,67 +28,5 @@ namespace Lucene.Net.Util
         {
             return new ArrayIntroSorter<Entry>(arr, ArrayUtil.naturalComparator<Entry>());
         }
-
-
-        #region BaseSortTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestEmpty()
-        {
-            base.TestEmpty();
-        }
-
-        [Test]
-        public override void TestOne()
-        {
-            base.TestOne();
-        }
-
-        [Test]
-        public override void TestTwo()
-        {
-            base.TestTwo();
-        }
-
-        [Test]
-        public override void TestRandom()
-        {
-            base.TestRandom();
-        }
-
-        [Test]
-        public override void TestRandomLowCardinality()
-        {
-            base.TestRandomLowCardinality();
-        }
-
-        [Test]
-        public override void TestAscending()
-        {
-            base.TestAscending();
-        }
-
-        [Test]
-        public override void TestAscendingSequences()
-        {
-            base.TestAscendingSequences();
-        }
-
-        [Test]
-        public override void TestDescending()
-        {
-            base.TestDescending();
-        }
-
-        [Test]
-        public override void TestStrictlyDescendingStrategy()
-        {
-            base.TestStrictlyDescendingStrategy();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs b/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
index 8144d1c..c72aa45 100644
--- a/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
@@ -514,49 +514,5 @@ namespace Lucene.Net.Util
             bits.FastSet(bit - 1);
             Assert.IsTrue(bits.FastGet(bit - 1));
         }
-
-
-        #region BaseDocIdSetTestCase<T>
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// Test length=0.
-        /// </summary>
-        [Test]
-        public override void TestNoBit()
-        {
-            base.TestNoBit();
-        }
-
-        /// <summary>
-        /// Test length=1.
-        /// </summary>
-        [Test]
-        public override void Test1Bit()
-        {
-            base.Test1Bit();
-        }
-
-        /// <summary>
-        /// Test length=2.
-        /// </summary>
-        [Test]
-        public override void Test2Bits()
-        {
-            base.Test2Bits();
-        }
-
-        /// <summary>
-        /// Compare the content of the set against a <seealso cref="BitSet"/>.
-        /// </summary>
-        [Test, LongRunningTest, Timeout(150000)]
-        public override void TestAgainstBitSet()
-        {
-            base.TestAgainstBitSet();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestPForDeltaDocIdSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestPForDeltaDocIdSet.cs b/src/Lucene.Net.Tests/core/Util/TestPForDeltaDocIdSet.cs
index b310b7b..3c92150 100644
--- a/src/Lucene.Net.Tests/core/Util/TestPForDeltaDocIdSet.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestPForDeltaDocIdSet.cs
@@ -38,49 +38,5 @@ namespace Lucene.Net.Util
             base.AssertEquals(numBits, ds1, ds2);
             Assert.AreEqual(ds1.Cardinality(), ds2.Cardinality());
         }
-
-
-        #region BaseDocIdSetTestCase<T>
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// Test length=0.
-        /// </summary>
-        [Test]
-        public override void TestNoBit()
-        {
-            base.TestNoBit();
-        }
-
-        /// <summary>
-        /// Test length=1.
-        /// </summary>
-        [Test]
-        public override void Test1Bit()
-        {
-            base.Test1Bit();
-        }
-
-        /// <summary>
-        /// Test length=2.
-        /// </summary>
-        [Test]
-        public override void Test2Bits()
-        {
-            base.Test2Bits();
-        }
-
-        /// <summary>
-        /// Compare the content of the set against a <seealso cref="BitSet"/>.
-        /// </summary>
-        [Test]
-        public override void TestAgainstBitSet()
-        {
-            base.TestAgainstBitSet();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestTimSorter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestTimSorter.cs b/src/Lucene.Net.Tests/core/Util/TestTimSorter.cs
index 8f13308..c12b850 100644
--- a/src/Lucene.Net.Tests/core/Util/TestTimSorter.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestTimSorter.cs
@@ -1,5 +1,3 @@
-using NUnit.Framework;
-
 namespace Lucene.Net.Util
 {
     /*
@@ -30,67 +28,5 @@ namespace Lucene.Net.Util
         {
             return new ArrayTimSorter<Entry>(arr, ArrayUtil.naturalComparator<Entry>(), TestUtil.NextInt(Random(), 0, arr.Length));
         }
-
-
-        #region BaseSortTestCase
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        [Test]
-        public override void TestEmpty()
-        {
-            base.TestEmpty();
-        }
-
-        [Test]
-        public override void TestOne()
-        {
-            base.TestOne();
-        }
-
-        [Test]
-        public override void TestTwo()
-        {
-            base.TestTwo();
-        }
-
-        [Test]
-        public override void TestRandom()
-        {
-            base.TestRandom();
-        }
-
-        [Test]
-        public override void TestRandomLowCardinality()
-        {
-            base.TestRandomLowCardinality();
-        }
-
-        [Test]
-        public override void TestAscending()
-        {
-            base.TestAscending();
-        }
-
-        [Test]
-        public override void TestAscendingSequences()
-        {
-            base.TestAscendingSequences();
-        }
-
-        [Test]
-        public override void TestDescending()
-        {
-            base.TestDescending();
-        }
-
-        [Test]
-        public override void TestStrictlyDescendingStrategy()
-        {
-            base.TestStrictlyDescendingStrategy();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/92de8d7e/src/Lucene.Net.Tests/core/Util/TestWAH8DocIdSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestWAH8DocIdSet.cs b/src/Lucene.Net.Tests/core/Util/TestWAH8DocIdSet.cs
index b0d3ea0..73d338d 100644
--- a/src/Lucene.Net.Tests/core/Util/TestWAH8DocIdSet.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestWAH8DocIdSet.cs
@@ -106,49 +106,5 @@ namespace Lucene.Net.Util
             }
             AssertEquals(numBits, expected, union);
         }
-
-
-        #region BaseDocIdSetTestCase<T>
-        // LUCENENET NOTE: Tests in an abstract base class are not pulled into the correct
-        // context in Visual Studio. This fixes that with the minimum amount of code necessary
-        // to run them in the correct context without duplicating all of the tests.
-
-        /// <summary>
-        /// Test length=0.
-        /// </summary>
-        [Test]
-        public override void TestNoBit()
-        {
-            base.TestNoBit();
-        }
-
-        /// <summary>
-        /// Test length=1.
-        /// </summary>
-        [Test]
-        public override void Test1Bit()
-        {
-            base.Test1Bit();
-        }
-
-        /// <summary>
-        /// Test length=2.
-        /// </summary>
-        [Test]
-        public override void Test2Bits()
-        {
-            base.Test2Bits();
-        }
-
-        /// <summary>
-        /// Compare the content of the set against a <seealso cref="BitSet"/>.
-        /// </summary>
-        [Test]
-        public override void TestAgainstBitSet()
-        {
-            base.TestAgainstBitSet();
-        }
-
-        #endregion
     }
 }
\ No newline at end of file