This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git

commit fd48c40ac458d6cab6fdc1cacb1ba29c3cf80299
Author: Shad Storhaug <[email protected]>
AuthorDate: Wed Jun 24 08:59:51 2020 +0700

    Lucene.Net.Tests.Index: Switched to using the Assert class in the test 
framework instead of NUnit (#295, #261)
---
 src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs        |  1 +
 src/Lucene.Net.Tests/Index/Test2BDocs.cs                   |  1 +
 src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs       |  1 +
 src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs        |  1 +
 src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs          |  1 +
 src/Lucene.Net.Tests/Index/TestAddIndexes.cs               |  1 +
 src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs  |  1 +
 src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs             |  1 +
 src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs   |  2 +-
 src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs |  2 +-
 src/Lucene.Net.Tests/Index/TestBagOfPositions.cs           |  2 +-
 src/Lucene.Net.Tests/Index/TestBagOfPostings.cs            |  8 ++++----
 src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs   |  2 +-
 src/Lucene.Net.Tests/Index/TestBinaryTerms.cs              |  1 +
 src/Lucene.Net.Tests/Index/TestByteSlices.cs               |  1 +
 src/Lucene.Net.Tests/Index/TestCheckIndex.cs               |  1 +
 src/Lucene.Net.Tests/Index/TestCodecs.cs                   |  1 +
 src/Lucene.Net.Tests/Index/TestCompoundFile.cs             |  5 +++--
 src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs |  1 +
 src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs   |  1 +
 src/Lucene.Net.Tests/Index/TestCrash.cs                    |  1 +
 src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs  |  1 +
 src/Lucene.Net.Tests/Index/TestCustomNorms.cs              |  1 +
 src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs           |  3 ++-
 src/Lucene.Net.Tests/Index/TestDirectoryReader.cs          |  1 +
 src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs    |  1 +
 src/Lucene.Net.Tests/Index/TestDoc.cs                      |  1 +
 src/Lucene.Net.Tests/Index/TestDocCount.cs                 |  5 +++--
 src/Lucene.Net.Tests/Index/TestDocTermOrds.cs              |  1 +
 src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs        |  1 +
 src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs     |  1 +
 src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs         |  1 +
 src/Lucene.Net.Tests/Index/TestDocumentWriter.cs           | 10 ++++++----
 .../Index/TestDocumentsWriterDeleteQueue.cs                |  4 +---
 src/Lucene.Net.Tests/Index/TestFieldInfos.cs               |  5 +++--
 src/Lucene.Net.Tests/Index/TestFieldsReader.cs             |  1 +
 src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs       |  8 ++++----
 src/Lucene.Net.Tests/Index/TestFlex.cs                     |  1 +
 src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs |  1 +
 src/Lucene.Net.Tests/Index/TestIndexCommit.cs              |  4 ++--
 src/Lucene.Net.Tests/Index/TestIndexInput.cs               |  6 +++---
 src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs         |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriter.cs              |  9 ++++-----
 src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs        |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs        |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs        |  6 ++----
 src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs    |  4 +---
 src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs    |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs   |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs       |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs    |  1 +
 src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs        |  5 +----
 src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs       |  2 +-
 src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs   |  2 +-
 src/Lucene.Net.Tests/Index/TestIndexableField.cs           |  1 +
 src/Lucene.Net.Tests/Index/TestIntBlockPool.cs             |  7 +++----
 src/Lucene.Net.Tests/Index/TestIsCurrent.cs                |  8 ++++----
 src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs         |  1 +
 src/Lucene.Net.Tests/Index/TestLongPostings.cs             |  1 +
 src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs         |  1 +
 src/Lucene.Net.Tests/Index/TestMixedCodecs.cs              |  1 +
 src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs    |  2 +-
 src/Lucene.Net.Tests/Index/TestMultiDocValues.cs           |  6 +++---
 src/Lucene.Net.Tests/Index/TestMultiFields.cs              |  1 +
 src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs       |  1 +
 src/Lucene.Net.Tests/Index/TestNRTThreads.cs               |  2 +-
 src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs         |  1 +
 src/Lucene.Net.Tests/Index/TestNorms.cs                    |  1 +
 src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs  |  2 +-
 src/Lucene.Net.Tests/Index/TestOmitNorms.cs                |  1 +
 src/Lucene.Net.Tests/Index/TestOmitPositions.cs            |  1 +
 src/Lucene.Net.Tests/Index/TestOmitTf.cs                   |  1 +
 src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs     |  8 ++++----
 src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs  |  1 +
 src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs |  1 +
 src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs         |  3 ++-
 src/Lucene.Net.Tests/Index/TestPayloads.cs                 |  1 +
 src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs        |  1 +
 src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs        |  1 +
 .../Index/TestPersistentSnapshotDeletionPolicy.cs          | 12 ++++++------
 src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs          |  1 +
 src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs         |  1 +
 src/Lucene.Net.Tests/Index/TestRollback.cs                 |  1 +
 src/Lucene.Net.Tests/Index/TestRollingUpdates.cs           |  1 +
 src/Lucene.Net.Tests/Index/TestSegmentMerger.cs            |  1 +
 src/Lucene.Net.Tests/Index/TestSegmentReader.cs            |  1 +
 src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs          |  1 +
 src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs          |  1 +
 src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs    |  1 +
 src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs   |  1 +
 src/Lucene.Net.Tests/Index/TestStressAdvance.cs            | 14 +++++++-------
 src/Lucene.Net.Tests/Index/TestStressIndexing2.cs          |  1 +
 src/Lucene.Net.Tests/Index/TestSumDocFreq.cs               |  1 +
 src/Lucene.Net.Tests/Index/TestTerm.cs                     |  5 +++--
 src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs        |  1 +
 src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs        |  1 +
 src/Lucene.Net.Tests/Index/TestTermsEnum.cs                |  1 +
 src/Lucene.Net.Tests/Index/TestTermsEnum2.cs               |  2 +-
 src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs       |  1 +
 src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs        |  1 +
 src/Lucene.Net.Tests/Index/TestTransactionRollback.cs      |  8 ++++----
 src/Lucene.Net.Tests/Index/TestTryDelete.cs                |  1 +
 102 files changed, 154 insertions(+), 88 deletions(-)

diff --git a/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs 
b/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs
index 73e5e67..e7e40cb 100644
--- a/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BBinaryDocValues.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/Test2BDocs.cs 
b/src/Lucene.Net.Tests/Index/Test2BDocs.cs
index a1d3c4e..a50fcbd 100644
--- a/src/Lucene.Net.Tests/Index/Test2BDocs.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BDocs.cs
@@ -1,5 +1,6 @@
 using Lucene.Net.Support;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs 
b/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs
index 63787e7..9eab695 100644
--- a/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BNumericDocValues.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs 
b/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs
index 79978f3..eddc306 100644
--- a/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/Test2BSortedDocValues.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs 
b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
index 3c99a3f..74c0390 100644
--- a/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
+++ b/src/Lucene.Net.Tests/Index/Test4GBStoredFields.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Randomized.Generators;
 using Lucene.Net.Store;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs 
b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
index ac00ff1..43ab1d4 100644
--- a/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
+++ b/src/Lucene.Net.Tests/Index/TestAddIndexes.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs 
b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
index 4051b8b..88519b8 100644
--- a/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
+++ b/src/Lucene.Net.Tests/Index/TestAllFilesHaveCodecHeader.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs 
b/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
index 150ec05..7917758 100644
--- a/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
+++ b/src/Lucene.Net.Tests/Index/TestAtomicUpdate.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs 
b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
index 1e7f83f..0771b57 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs
@@ -1,7 +1,6 @@
 using J2N;
 using Lucene.Net.Attributes;
 using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
@@ -9,6 +8,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs 
b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
index 013fdee..31c1526 100644
--- a/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
+++ b/src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs
@@ -1,12 +1,12 @@
 using J2N;
 using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs 
b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
index f152c98..572b577 100644
--- a/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestBagOfPositions.cs
@@ -1,7 +1,6 @@
 using J2N.Collections.Generic.Extensions;
 using J2N.Threading;
 using Lucene.Net.Documents;
-using Lucene.Net.Support;
 using NUnit.Framework;
 using System;
 using System.Collections.Concurrent;
@@ -9,6 +8,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs 
b/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
index c9d82cf..9a2ba29 100644
--- a/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
+++ b/src/Lucene.Net.Tests/Index/TestBagOfPostings.cs
@@ -1,16 +1,16 @@
+using J2N.Collections.Generic.Extensions;
 using J2N.Threading;
 using Lucene.Net.Documents;
-using Lucene.Net.Support;
 using NUnit.Framework;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Text;
 using System.Threading;
-using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
-using J2N.Collections.Generic.Extensions;
-using System.Globalization;
+using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs 
b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
index 9d76073..d266f9e 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs
@@ -16,9 +16,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 using JCG = J2N.Collections.Generic;
-using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs 
b/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
index e456ac7..45af4b0 100644
--- a/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
+++ b/src/Lucene.Net.Tests/Index/TestBinaryTerms.cs
@@ -1,5 +1,6 @@
 using Lucene.Net.Documents;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestByteSlices.cs 
b/src/Lucene.Net.Tests/Index/TestByteSlices.cs
index 5a8fc3e..38a4add 100644
--- a/src/Lucene.Net.Tests/Index/TestByteSlices.cs
+++ b/src/Lucene.Net.Tests/Index/TestByteSlices.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Attributes;
 using Lucene.Net.Randomized.Generators;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCheckIndex.cs 
b/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
index 04b7a90..e3fb5bb 100644
--- a/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestCheckIndex.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCodecs.cs 
b/src/Lucene.Net.Tests/Index/TestCodecs.cs
index 46571db..1c17770 100644
--- a/src/Lucene.Net.Tests/Index/TestCodecs.cs
+++ b/src/Lucene.Net.Tests/Index/TestCodecs.cs
@@ -10,6 +10,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs 
b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
index 6a24123..ad71c5a 100644
--- a/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
+++ b/src/Lucene.Net.Tests/Index/TestCompoundFile.cs
@@ -1,11 +1,12 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Store;
+using NUnit.Framework;
 using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
-    using System.IO;
     using CompoundFileDirectory = Lucene.Net.Store.CompoundFileDirectory;
     using Directory = Lucene.Net.Store.Directory;
 
diff --git a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs 
b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
index be9454f..03c8796 100644
--- a/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
 using System;
 using System.IO;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs 
b/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs
index b36f260..8056ea0 100644
--- a/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs
+++ b/src/Lucene.Net.Tests/Index/TestConsistentFieldNumbers.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using Lucene.Net.Support;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestCrash.cs 
b/src/Lucene.Net.Tests/Index/TestCrash.cs
index 2976a80..043d09a 100644
--- a/src/Lucene.Net.Tests/Index/TestCrash.cs
+++ b/src/Lucene.Net.Tests/Index/TestCrash.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs 
b/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
index 978f086..7139a25 100644
--- a/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestCrashCausesCorruptIndex.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestCustomNorms.cs 
b/src/Lucene.Net.Tests/Index/TestCustomNorms.cs
index 9199e7f..777a17a 100644
--- a/src/Lucene.Net.Tests/Index/TestCustomNorms.cs
+++ b/src/Lucene.Net.Tests/Index/TestCustomNorms.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
 using System.Globalization;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs 
b/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
index a6e3aca..4fbb3b8 100644
--- a/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestDeletionPolicy.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Attributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
@@ -6,6 +7,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
@@ -38,7 +40,6 @@ namespace Lucene.Net.Index
     using ScoreDoc = Lucene.Net.Search.ScoreDoc;
     using TermQuery = Lucene.Net.Search.TermQuery;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using Attributes;
 
     /*
       Verify we can read the pre-2.1 file format, do searches
diff --git a/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs 
b/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
index be74c4d..3b30a16 100644
--- a/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestDirectoryReader.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs 
b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
index df1542b..b7e5363 100644
--- a/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
+++ b/src/Lucene.Net.Tests/Index/TestDirectoryReaderReopen.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDoc.cs 
b/src/Lucene.Net.Tests/Index/TestDoc.cs
index a596e44..da6bf90 100644
--- a/src/Lucene.Net.Tests/Index/TestDoc.cs
+++ b/src/Lucene.Net.Tests/Index/TestDoc.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDocCount.cs 
b/src/Lucene.Net.Tests/Index/TestDocCount.cs
index 51a311c..c631735 100644
--- a/src/Lucene.Net.Tests/Index/TestDocCount.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocCount.cs
@@ -1,9 +1,10 @@
-using System.Collections.Generic;
 using Lucene.Net.Documents;
+using NUnit.Framework;
+using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
     using Directory = Lucene.Net.Store.Directory;
     using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
 
diff --git a/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs 
b/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
index 504c4df..ab88b49 100644
--- a/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocTermOrds.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs 
b/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
index 4f504bd..bec0807 100644
--- a/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocValuesIndexing.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Search;
 using NUnit.Framework;
 using System;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs 
b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
index d9ab4ad..69301e6 100644
--- a/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocValuesWithThreads.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs 
b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
index 4fc0108..afbf8ab 100644
--- a/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocsAndPositions.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs 
b/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs
index 14ca6b7..49ec4da 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentWriter.cs
@@ -1,5 +1,10 @@
+using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
+using NUnit.Framework;
+using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
@@ -20,10 +25,7 @@ namespace Lucene.Net.Index
      * limitations under the License.
      */
 
-    using Lucene.Net.Analysis;
-    using NUnit.Framework;
-    using System;
-    using System.IO;
+
     using AttributeSource = Lucene.Net.Util.AttributeSource;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs 
b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
index c9de8d9..3c7287c 100644
--- a/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
+++ b/src/Lucene.Net.Tests/Index/TestDocumentsWriterDeleteQueue.cs
@@ -4,16 +4,15 @@ using Lucene.Net.Search;
 using Lucene.Net.Support.Threading;
 using NUnit.Framework;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
 {
     using BytesRef = Lucene.Net.Util.BytesRef;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements. See the NOTICE file distributed 
with this
@@ -34,7 +33,6 @@ namespace Lucene.Net.Index
     using DeleteSlice = 
Lucene.Net.Index.DocumentsWriterDeleteQueue.DeleteSlice;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
     using TermQuery = Lucene.Net.Search.TermQuery;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     /// <summary>
     /// Unit test for <seealso cref="DocumentsWriterDeleteQueue"/>
diff --git a/src/Lucene.Net.Tests/Index/TestFieldInfos.cs 
b/src/Lucene.Net.Tests/Index/TestFieldInfos.cs
index 7b0d3da..5388479 100644
--- a/src/Lucene.Net.Tests/Index/TestFieldInfos.cs
+++ b/src/Lucene.Net.Tests/Index/TestFieldInfos.cs
@@ -1,7 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
diff --git a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs 
b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
index 87877c6..4347a04 100644
--- a/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestFieldsReader.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs 
b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs
index 11b8e09..8726726 100644
--- a/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestFilterAtomicReader.cs
@@ -1,20 +1,20 @@
+using Lucene.Net.Documents;
+using NUnit.Framework;
 using System;
 using System.Linq;
 using System.Reflection;
-using Lucene.Net.Documents;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
     using BaseDirectoryWrapper = Lucene.Net.Store.BaseDirectoryWrapper;
-    using IBits = Lucene.Net.Util.IBits;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using Directory = Lucene.Net.Store.Directory;
     using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
     using Document = Documents.Document;
     using Field = Field;
+    using IBits = Lucene.Net.Util.IBits;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
diff --git a/src/Lucene.Net.Tests/Index/TestFlex.cs 
b/src/Lucene.Net.Tests/Index/TestFlex.cs
index 874eece..4e2d77b 100644
--- a/src/Lucene.Net.Tests/Index/TestFlex.cs
+++ b/src/Lucene.Net.Tests/Index/TestFlex.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
 using Lucene.Net.Util;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs 
b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
index bfb6bd9..dd4880a 100644
--- a/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestFlushByRamOrCountsPolicy.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Store;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexCommit.cs 
b/src/Lucene.Net.Tests/Index/TestIndexCommit.cs
index 2cf47cb..009fbda 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexCommit.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexCommit.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
diff --git a/src/Lucene.Net.Tests/Index/TestIndexInput.cs 
b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
index b794560..f88628f 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexInput.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexInput.cs
@@ -1,10 +1,10 @@
+using NUnit.Framework;
 using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
-    using System.IO;
-    using System.Reflection;
     using ByteArrayDataInput = Lucene.Net.Store.ByteArrayDataInput;
     using ByteArrayDataOutput = Lucene.Net.Store.ByteArrayDataOutput;
     using DataInput = Lucene.Net.Store.DataInput;
diff --git a/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs 
b/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs
index 1538e2e..63f0de9 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexReaderClose.cs
@@ -2,6 +2,7 @@ using J2N.Threading.Atomic;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
index f112acf..1101ce2 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriter.cs
@@ -14,12 +14,12 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading;
-using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
+using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
 {
@@ -40,7 +40,8 @@ namespace Lucene.Net.Index
     * limitations under the License.
     */
 
-    
+
+    using Assert = Lucene.Net.TestFramework.Assert;
     using Automaton = Lucene.Net.Util.Automaton.Automaton;
     using BaseDirectoryWrapper = Lucene.Net.Store.BaseDirectoryWrapper;
     using BasicAutomata = Lucene.Net.Util.Automaton.BasicAutomata;
@@ -48,7 +49,6 @@ namespace Lucene.Net.Index
     using BinaryDocValuesField = BinaryDocValuesField;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using CharacterRunAutomaton = 
Lucene.Net.Util.Automaton.CharacterRunAutomaton;
-    using CharTermAttribute = 
Lucene.Net.Analysis.TokenAttributes.CharTermAttribute;
     using Constants = Lucene.Net.Util.Constants;
     using Directory = Lucene.Net.Store.Directory;
     using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
@@ -81,7 +81,6 @@ namespace Lucene.Net.Index
     using TermQuery = Lucene.Net.Search.TermQuery;
     using TestUtil = Lucene.Net.Util.TestUtil;
     using TextField = TextField;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     [TestFixture]
     public class TestIndexWriter : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
index df20d4d..fc9d5ec 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterCommit.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
index 7d5c9d3..a958769 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterConfig.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
index 70fa5e5..935eac8 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterDelete.cs
@@ -6,16 +6,15 @@ using Lucene.Net.Attributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
-using Lucene.Net.Support;
 using Lucene.Net.Support.IO;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
@@ -38,12 +37,12 @@ namespace Lucene.Net.Index
          */
 
     using Analyzer = Lucene.Net.Analysis.Analyzer;
+    using Assert = Lucene.Net.TestFramework.Assert;
     using Directory = Lucene.Net.Store.Directory;
     using Document = Documents.Document;
     using Field = Field;
     using FieldType = FieldType;
     using IndexSearcher = Lucene.Net.Search.IndexSearcher;
-    using IOUtils = Lucene.Net.Util.IOUtils;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
     using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
     using MockDirectoryWrapper = Lucene.Net.Store.MockDirectoryWrapper;
@@ -54,7 +53,6 @@ namespace Lucene.Net.Index
     using StringField = StringField;
     using TermQuery = Lucene.Net.Search.TermQuery;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     [TestFixture]
     public class TestIndexWriterDelete : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index 80404a8..0e904d0 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -1,7 +1,6 @@
 using J2N.Threading;
 using J2N.Threading.Atomic;
 using Lucene.Net.Analysis;
-using Lucene.Net.Attributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
@@ -10,9 +9,9 @@ using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
@@ -65,7 +64,6 @@ namespace Lucene.Net.Index
     using Token = Lucene.Net.Analysis.Token;
     using TokenFilter = Lucene.Net.Analysis.TokenFilter;
     using TokenStream = Lucene.Net.Analysis.TokenStream;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     [TestFixture]
     public class TestIndexWriterExceptions : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
index 0763274..6d8d02f 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterForceMerge.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs
index 995b1c1..47f0930 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMergePolicy.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
index 29816ce..5a6992e 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterMerging.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
index 3e7ac16..bdd6d93 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterOnDiskFull.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
index d8b5216..d2c4f32 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs
@@ -4,13 +4,12 @@ using Lucene.Net.Attributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
-using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
@@ -42,7 +41,6 @@ namespace Lucene.Net.Index
     using IndexSearcher = Lucene.Net.Search.IndexSearcher;
     using InfoStream = Lucene.Net.Util.InfoStream;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-
     using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
     using MockDirectoryWrapper = Lucene.Net.Store.MockDirectoryWrapper;
     using Query = Lucene.Net.Search.Query;
@@ -51,7 +49,6 @@ namespace Lucene.Net.Index
     using TestUtil = Lucene.Net.Util.TestUtil;
     using TextField = TextField;
     using TopDocs = Lucene.Net.Search.TopDocs;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     [TestFixture]
     public class TestIndexWriterReader : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
index 317e16a..5868044 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterUnicode.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -36,7 +37,6 @@ namespace Lucene.Net.Index
 
     using MockAnalyzer = Lucene.Net.Analysis.MockAnalyzer;
     using UnicodeUtil = Lucene.Net.Util.UnicodeUtil;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     [TestFixture]
     public class TestIndexWriterUnicode : LuceneTestCase
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs 
b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
index 2b62206..bbeb236 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterWithThreads.cs
@@ -9,6 +9,7 @@ using NUnit.Framework;
 using System;
 using System.IO;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
@@ -26,7 +27,6 @@ namespace Lucene.Net.Index
     using LineFileDocs = Lucene.Net.Util.LineFileDocs;
     using LockObtainFailedException = 
Lucene.Net.Store.LockObtainFailedException;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Tests/Index/TestIndexableField.cs 
b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
index ea00518..2cfec00 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexableField.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexableField.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs 
b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
index ac9d0de..40219c7 100644
--- a/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
+++ b/src/Lucene.Net.Tests/Index/TestIntBlockPool.cs
@@ -1,11 +1,10 @@
+using Lucene.Net.Attributes;
+using NUnit.Framework;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using Lucene.Net.Attributes;
-    using Lucene.Net.Randomized.Generators;
-    using NUnit.Framework;
-
     /*
              * Licensed to the Apache Software Foundation (ASF) under one or 
more
              * contributor license agreements.  See the NOTICE file 
distributed with
diff --git a/src/Lucene.Net.Tests/Index/TestIsCurrent.cs 
b/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
index 0520c60..9fc5d77 100644
--- a/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
+++ b/src/Lucene.Net.Tests/Index/TestIsCurrent.cs
@@ -1,11 +1,11 @@
 using Lucene.Net.Documents;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using Lucene.Net.Store;
-    using Lucene.Net.Util;
-    using NUnit.Framework;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
diff --git a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs 
b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
index f449b39..c7f579f 100644
--- a/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
+++ b/src/Lucene.Net.Tests/Index/TestLazyProxSkipping.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestLongPostings.cs 
b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
index df04d2c..9c2388a 100644
--- a/src/Lucene.Net.Tests/Index/TestLongPostings.cs
+++ b/src/Lucene.Net.Tests/Index/TestLongPostings.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using System;
 using System.Diagnostics;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs 
b/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs
index 69a6072..31d519c 100644
--- a/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs
+++ b/src/Lucene.Net.Tests/Index/TestMaxTermFrequency.cs
@@ -6,6 +6,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs 
b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
index 759cbe7..60fa880 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedCodecs.cs
@@ -4,6 +4,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs 
b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
index 100ce2d..0e54f77 100644
--- a/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestMixedDocValuesUpdates.cs
@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -26,7 +27,6 @@ namespace Lucene.Net.Index
     using Store = Field.Store;
     using StringField = StringField;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs 
b/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs
index dc51c11..12ddef5 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiDocValues.cs
@@ -1,11 +1,11 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
+using NUnit.Framework;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
@@ -24,11 +24,11 @@ namespace Lucene.Net.Index
          */
 
     using BinaryDocValuesField = BinaryDocValuesField;
-    using IBits = Lucene.Net.Util.IBits;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using Directory = Lucene.Net.Store.Directory;
     using Document = Documents.Document;
     using Field = Field;
+    using IBits = Lucene.Net.Util.IBits;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
     using NumericDocValuesField = NumericDocValuesField;
     using SortedDocValuesField = SortedDocValuesField;
diff --git a/src/Lucene.Net.Tests/Index/TestMultiFields.cs 
b/src/Lucene.Net.Tests/Index/TestMultiFields.cs
index 24fa07a..3486a8f 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiFields.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiFields.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs 
b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
index 592f2f0..77878ab 100644
--- a/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
+++ b/src/Lucene.Net.Tests/Index/TestMultiLevelSkipList.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs 
b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
index 841f5bc..f9503e3 100644
--- a/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
+++ b/src/Lucene.Net.Tests/Index/TestNRTThreads.cs
@@ -1,9 +1,9 @@
-using Lucene.Net.Randomized.Generators;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs 
b/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs
index 968a6c6..704ca5c 100644
--- a/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestNoDeletionPolicy.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Support;
 using NUnit.Framework;
 using System.Reflection;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestNorms.cs 
b/src/Lucene.Net.Tests/Index/TestNorms.cs
index c376580..9bdba52 100644
--- a/src/Lucene.Net.Tests/Index/TestNorms.cs
+++ b/src/Lucene.Net.Tests/Index/TestNorms.cs
@@ -2,6 +2,7 @@ using System;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs 
b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
index 2efbfb4..f628e5c 100644
--- a/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestNumericDocValuesUpdates.cs
@@ -11,6 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -39,7 +40,6 @@ namespace Lucene.Net.Index
     using Store = Field.Store;
     using StringField = StringField;
     using TestUtil = Lucene.Net.Util.TestUtil;
-    using Assert = Lucene.Net.TestFramework.Assert;
 
 
     /*
diff --git a/src/Lucene.Net.Tests/Index/TestOmitNorms.cs 
b/src/Lucene.Net.Tests/Index/TestOmitNorms.cs
index 5c045a7..5e408a8 100644
--- a/src/Lucene.Net.Tests/Index/TestOmitNorms.cs
+++ b/src/Lucene.Net.Tests/Index/TestOmitNorms.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs 
b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
index a63d471..5f3c396 100644
--- a/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
+++ b/src/Lucene.Net.Tests/Index/TestOmitPositions.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestOmitTf.cs 
b/src/Lucene.Net.Tests/Index/TestOmitTf.cs
index d64f315..19e3fd3 100644
--- a/src/Lucene.Net.Tests/Index/TestOmitTf.cs
+++ b/src/Lucene.Net.Tests/Index/TestOmitTf.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
 using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs 
b/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs
index 9bf5c52..39a07c9 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelAtomicReader.cs
@@ -1,11 +1,11 @@
-using System;
 using Lucene.Net.Documents;
+using Lucene.Net.Search;
+using NUnit.Framework;
+using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using Lucene.Net.Randomized.Generators;
-    using Lucene.Net.Search;
-    using NUnit.Framework;
     using Directory = Lucene.Net.Store.Directory;
     using Document = Documents.Document;
     using Field = Field;
diff --git a/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs 
b/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs
index 066b331..2a43cf7 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelCompositeReader.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Search;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs 
b/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
index 7e9ad21..e2458de 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelReaderEmptyIndex.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs 
b/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs
index 409d930..7c46993 100644
--- a/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs
+++ b/src/Lucene.Net.Tests/Index/TestParallelTermEnum.cs
@@ -1,9 +1,10 @@
 using System.Collections.Generic;
 using Lucene.Net.Documents;
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
     using IBits = Lucene.Net.Util.IBits;
     using BytesRef = Lucene.Net.Util.BytesRef;
     using Directory = Lucene.Net.Store.Directory;
diff --git a/src/Lucene.Net.Tests/Index/TestPayloads.cs 
b/src/Lucene.Net.Tests/Index/TestPayloads.cs
index 0fd2251..3c589c3 100644
--- a/src/Lucene.Net.Tests/Index/TestPayloads.cs
+++ b/src/Lucene.Net.Tests/Index/TestPayloads.cs
@@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs 
b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
index 74c2ef5..ee33818 100644
--- a/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
+++ b/src/Lucene.Net.Tests/Index/TestPayloadsOnVectors.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System.Diagnostics;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs 
b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
index c2f1993..a9ee2f2 100644
--- a/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
+++ b/src/Lucene.Net.Tests/Index/TestPerSegmentDeletes.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Support;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs 
b/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs
index 744fb96..622573c 100644
--- a/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestPersistentSnapshotDeletionPolicy.cs
@@ -1,12 +1,12 @@
-using System.Diagnostics;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using System;
+using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using Lucene.Net.Store;
-    using NUnit.Framework;
-    using System;
-    using System.IO;
-    using Util;
     using Directory = Lucene.Net.Store.Directory;
 
     /*
diff --git a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs 
b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
index 982eed2..44b2aad 100644
--- a/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
+++ b/src/Lucene.Net.Tests/Index/TestPostingsOffsets.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs 
b/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs
index 84a65d0..e3cd8be 100644
--- a/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs
+++ b/src/Lucene.Net.Tests/Index/TestPrefixCodedTerms.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestRollback.cs 
b/src/Lucene.Net.Tests/Index/TestRollback.cs
index ce3dcb7..c175173 100644
--- a/src/Lucene.Net.Tests/Index/TestRollback.cs
+++ b/src/Lucene.Net.Tests/Index/TestRollback.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs 
b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
index aeaf635..8601428 100644
--- a/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
+++ b/src/Lucene.Net.Tests/Index/TestRollingUpdates.cs
@@ -6,6 +6,7 @@ using Lucene.Net.Store;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs 
b/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
index af97f97..dfefb27 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentMerger.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentReader.cs 
b/src/Lucene.Net.Tests/Index/TestSegmentReader.cs
index 902f1aa..91044a0 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentReader.cs
@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs 
b/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs
index e05f2e3..38a2196 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentTermDocs.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs 
b/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs
index 2dead04..4a3178b 100644
--- a/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs
+++ b/src/Lucene.Net.Tests/Index/TestSegmentTermEnum.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs 
b/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs
index 6ed82d7..dfc0ee4 100644
--- a/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs
+++ b/src/Lucene.Net.Tests/Index/TestSizeBoundedForceMerge.cs
@@ -1,6 +1,7 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs 
b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
index a2490f3..b6aa061 100644
--- a/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestSnapshotDeletionPolicy.cs
@@ -5,6 +5,7 @@ using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs 
b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
index 974978e..9a82a96 100644
--- a/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressAdvance.cs
@@ -1,14 +1,15 @@
+using Lucene.Net.Documents;
+using Lucene.Net.Store;
+using Lucene.Net.Util;
+using NUnit.Framework;
 using System;
 using System.Collections.Generic;
-using Lucene.Net.Documents;
-using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
+using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
 {
-    
-    using Lucene.Net.Store;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
@@ -26,8 +27,7 @@ namespace Lucene.Net.Index
          * limitations under the License.
          */
 
-    using Lucene.Net.Util;
-    using NUnit.Framework;
+
     using DocIdSetIterator = Lucene.Net.Search.DocIdSetIterator;
 
     [TestFixture]
diff --git a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs 
b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs
index 8adb04a..d0ede86 100644
--- a/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs
+++ b/src/Lucene.Net.Tests/Index/TestStressIndexing2.cs
@@ -11,6 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs 
b/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
index d92299f..e6c00b3 100644
--- a/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
+++ b/src/Lucene.Net.Tests/Index/TestSumDocFreq.cs
@@ -1,6 +1,7 @@
 using System;
 using Lucene.Net.Documents;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTerm.cs 
b/src/Lucene.Net.Tests/Index/TestTerm.cs
index 308dbba..a9e616c 100644
--- a/src/Lucene.Net.Tests/Index/TestTerm.cs
+++ b/src/Lucene.Net.Tests/Index/TestTerm.cs
@@ -1,7 +1,8 @@
+using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
+
 namespace Lucene.Net.Index
 {
-    using NUnit.Framework;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs 
b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
index df3948f..d085311 100644
--- a/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermVectorsReader.cs
@@ -5,6 +5,7 @@ using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs 
b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
index 8599eb9..2f13df2 100644
--- a/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermVectorsWriter.cs
@@ -2,6 +2,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System.IO;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs 
b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
index 47f9a6f..32e48e0 100644
--- a/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermsEnum.cs
@@ -7,6 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using JCG = J2N.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs 
b/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs
index 7609376..3b8c431 100644
--- a/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs
+++ b/src/Lucene.Net.Tests/Index/TestTermsEnum2.cs
@@ -1,11 +1,11 @@
 using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
-using Lucene.Net.Support;
 using Lucene.Net.Util.Automaton;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs 
b/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs
index 0c7fead..b13b792 100644
--- a/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs
+++ b/src/Lucene.Net.Tests/Index/TestThreadedForceMerge.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
 using NUnit.Framework;
 using System;
 using System.Threading;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs 
b/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs
index 1767a59..eeaa9f2 100644
--- a/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs
+++ b/src/Lucene.Net.Tests/Index/TestTieredMergePolicy.cs
@@ -4,6 +4,7 @@ using Lucene.Net.Index.Extensions;
 using Lucene.Net.Store;
 using NUnit.Framework;
 using System;
+using Assert = Lucene.Net.TestFramework.Assert;
 using Console = Lucene.Net.Util.SystemConsole;
 
 namespace Lucene.Net.Index
diff --git a/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs 
b/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs
index e9b3f65..c776dcf 100644
--- a/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs
+++ b/src/Lucene.Net.Tests/Index/TestTransactionRollback.cs
@@ -1,20 +1,20 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
+using Lucene.Net.Support;
+using NUnit.Framework;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {
-    using Lucene.Net.Support;
-    using NUnit.Framework;
-    using IBits = Lucene.Net.Util.IBits;
     using Directory = Lucene.Net.Store.Directory;
     using Document = Documents.Document;
     using Field = Field;
+    using IBits = Lucene.Net.Util.IBits;
     using LuceneTestCase = Lucene.Net.Util.LuceneTestCase;
-
     /*
          * Licensed to the Apache Software Foundation (ASF) under one or more
          * contributor license agreements.  See the NOTICE file distributed 
with
diff --git a/src/Lucene.Net.Tests/Index/TestTryDelete.cs 
b/src/Lucene.Net.Tests/Index/TestTryDelete.cs
index f2b759c..31f0d0d 100644
--- a/src/Lucene.Net.Tests/Index/TestTryDelete.cs
+++ b/src/Lucene.Net.Tests/Index/TestTryDelete.cs
@@ -3,6 +3,7 @@ using Lucene.Net.Documents;
 using Lucene.Net.Index.Extensions;
 using Lucene.Net.Search;
 using NUnit.Framework;
+using Assert = Lucene.Net.TestFramework.Assert;
 
 namespace Lucene.Net.Index
 {

Reply via email to