Address PR feedback

Author: paulirwin

src/Lucene.Net.Benchmark/ByTask/Tasks/CloseIndexTask.cs

@@ -47,7 +47,9 @@ public override int DoLogic()
                 {
                     infoStream.Dispose();
                 }
+#pragma warning disable 612, 618
                 iw.Dispose(doWait);
+#pragma warning restore 612, 618
                 RunData.IndexWriter = null;
             }
             return 1;

src/Lucene.Net.TestFramework/Analysis/BaseTokenStreamTestCase.cs

@@ -5,6 +5,7 @@
 using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Support;
+using Lucene.Net.Support.Threading;
 using Lucene.Net.Util;
 using RandomizedTesting.Generators;
 using System;
@@ -17,7 +18,6 @@
 using Attribute = Lucene.Net.Util.Attribute;
 using Directory = Lucene.Net.Store.Directory;
 using JCG = J2N.Collections.Generic;
-using Lucene.Net.Support.Threading;
 
 namespace Lucene.Net.Analysis
 {
@@ -711,7 +711,7 @@ public static void CheckRandomData(Random random, Analyzer a, int iterations, in
                 // now test with multiple threads: note we do the EXACT same thing we did before in each thread,
                 // so this should only really fail from another thread if its an actual thread problem
                 int numThreads = TestUtil.NextInt32(random, 2, 4);
-                var startingGun = new CountDownLatch(1);
+                using var startingGun = new CountDownLatch(1);
                 var threads = new AnalysisThread[numThreads];
                 for (int i = 0; i < threads.Length; i++)
                 {

src/Lucene.Net.TestFramework/Index/BaseDocValuesFormatTestCase.cs

@@ -8,6 +8,7 @@
 using Lucene.Net.Search;
 using Lucene.Net.Store;
 using Lucene.Net.Support;
+using Lucene.Net.Support.Threading;
 using Lucene.Net.Util;
 using RandomizedTesting.Generators;
 using System;
@@ -18,7 +19,6 @@
 using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
 using Test = NUnit.Framework.TestAttribute;
-using Lucene.Net.Support.Threading;
 
 namespace Lucene.Net.Index
 {
@@ -3244,7 +3244,7 @@ public virtual void TestThreads()
             using DirectoryReader ir = DirectoryReader.Open(dir);
             int numThreads = TestUtil.NextInt32(Random, 2, 7);
             ThreadJob[] threads = new ThreadJob[numThreads];
-            CountDownLatch startingGun = new CountDownLatch(1);
+            using CountDownLatch startingGun = new CountDownLatch(1);
             for (int i = 0; i < threads.Length; i++)
             {
                 threads[i] = new ThreadAnonymousClass(ir, startingGun);
@@ -3380,7 +3380,7 @@ public virtual void TestThreads2()
             using DirectoryReader ir = DirectoryReader.Open(dir);
             int numThreads = TestUtil.NextInt32(Random, 2, 7);
             ThreadJob[] threads = new ThreadJob[numThreads];
-            CountDownLatch startingGun = new CountDownLatch(1);
+            using CountDownLatch startingGun = new CountDownLatch(1);
             for (int i = 0; i < threads.Length; i++)
             {
                 threads[i] = new ThreadAnonymousClass2(ir, startingGun);

src/Lucene.Net.TestFramework/Index/ThreadedIndexingAndSearchingTestCase.cs

@@ -772,7 +772,9 @@ public virtual void RunTest(string testName)
             assertEquals("index=" + m_writer.SegString() + " addCount=" + m_addCount + " delCount=" + m_delCount, m_addCount - m_delCount, m_writer.NumDocs);
 
             DoClose();
+#pragma warning disable 612, 618
             m_writer.Dispose(false);
+#pragma warning restore 612, 618
 
             // Cannot shutdown until after writer is closed because
             // writer has merged segment warmer that uses IS to run

src/Lucene.Net.Tests/Index/TestAddIndexes.cs

@@ -804,7 +804,9 @@ internal virtual void JoinThreads()
             internal virtual void Close(bool doWait)
             {
                 didClose = true;
+#pragma warning disable 612, 618
                 writer2.Dispose(doWait);
+#pragma warning restore 612, 618
             }
 
             internal virtual void CloseDir()

src/Lucene.Net.Tests/Index/TestBackwardsCompatibility.cs

@@ -313,7 +313,9 @@ public virtual void TestUnsupportedOldIndexes()
                     // above, so close without waiting for merges.
                     if (writer != null)
                     {
+#pragma warning disable 612, 618
                         writer.Dispose(false);
+#pragma warning restore 612, 618
                     }
                     writer = null;
                 }
@@ -1050,7 +1052,9 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                     {
                         AddDoc(w, id++);
                     }
+#pragma warning disable 612, 618
                     w.Dispose(false);
+#pragma warning restore 612, 618
                 }
 
                 // add dummy segments (which are all in current
@@ -1061,7 +1065,9 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                     .SetMergePolicy(mp_);
                 IndexWriter iw = new IndexWriter(dir, iwc_);
                 iw.AddIndexes(ramDir);
+#pragma warning disable 612, 618
                 iw.Dispose(false);
+#pragma warning restore 612, 618
 
                 // determine count of segments in modified index
                 int origSegCount = GetNumberOfSegments(dir);

src/Lucene.Net.Tests/Index/TestBackwardsCompatibility3x.cs

@@ -244,7 +244,9 @@ public virtual void TestUnsupportedOldIndexes()
                     // above, so close without waiting for merges.
                     if (writer != null)
                     {
+#pragma warning disable 612, 618
                         writer.Dispose(false);
+#pragma warning restore 612, 618
                     }
                     writer = null;
                 }
@@ -955,7 +957,9 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                     {
                         AddDoc(w, id++);
                     }
+#pragma warning disable 612, 618
                     w.Dispose(false);
+#pragma warning restore 612, 618
                 }
 
                 // add dummy segments (which are all in current
@@ -965,7 +969,9 @@ public virtual void TestUpgradeOldSingleSegmentIndexWithAdditions()
                     .SetMergePolicy(mp_);
                 IndexWriter w_ = new IndexWriter(dir, iwc_);
                 w_.AddIndexes(ramDir);
+#pragma warning disable 612, 618
                 w_.Dispose(false);
+#pragma warning restore 612, 618
 
                 // determine count of segments in modified index
                 int origSegCount = GetNumberOfSegments(dir);

src/Lucene.Net.Tests/Index/TestBagOfPositions.cs

@@ -10,8 +10,8 @@
 using System.Globalization;
 using System.Text;
 using System.Threading;
-using JCG = J2N.Collections.Generic;
 using Assert = Lucene.Net.TestFramework.Assert;
+using JCG = J2N.Collections.Generic;
 
 namespace Lucene.Net.Index
 {

src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs

@@ -10,6 +10,7 @@
 using Lucene.Net.Search;
 using Lucene.Net.Store;
 using Lucene.Net.Support;
+using Lucene.Net.Support.Threading;
 using NUnit.Framework;
 using RandomizedTesting.Generators;
 using System;
@@ -18,7 +19,6 @@
 using System.Threading;
 using Assert = Lucene.Net.TestFramework.Assert;
 using JCG = J2N.Collections.Generic;
-using Lucene.Net.Support.Threading;
 
 namespace Lucene.Net.Index
 {

src/Lucene.Net.Tests/Index/TestConcurrentMergeScheduler.cs

@@ -261,7 +261,9 @@ public virtual void TestNoWaitClose()
                 writer.AddDocument(doc);
                 writer.Commit();
 
+#pragma warning disable 612, 618
                 writer.Dispose(false);
+#pragma warning restore 612, 618
 
                 IndexReader reader = DirectoryReader.Open(directory);
                 Assert.AreEqual((1 + iter) * 182, reader.NumDocs);
@@ -316,7 +318,9 @@ public virtual void TestMaxMergeCount()
                     w.AddDocument(doc);
                 }
             }
+#pragma warning disable 612, 618
             w.Dispose(false);
+#pragma warning restore 612, 618
             dir.Dispose();
         }