PR feedback

Author: paulirwin

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

@@ -6,6 +6,10 @@
 using System;
 using Assert = Lucene.Net.TestFramework.Assert;
 
+#if !FEATURE_RANDOM_NEXTINT64_NEXTSINGLE
+using RandomizedTesting.Generators; // for Random.NextInt64 extension method
+#endif
+
 namespace Lucene.Net.Index
 {
     /*
@@ -279,22 +283,22 @@ public virtual void TestSetters()
         [Test]
         public void TestUnbalancedMergeSelection()
         {
-            Directory dir = NewDirectory();
+            using Directory dir = NewDirectory();
             IndexWriterConfig iwc = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(Random));
             TieredMergePolicy tmp = (TieredMergePolicy)iwc.MergePolicy;
             tmp.FloorSegmentMB = 0.00001;
             iwc.MergeScheduler = new SerialMergeScheduler();
             iwc.MaxBufferedDocs = 100;
             iwc.RAMBufferSizeMB = -1;
-            IndexWriter w = new IndexWriter(dir, iwc);
+            using IndexWriter w = new IndexWriter(dir, iwc);
             for (int i = 0; i < 100000; i++)
             {
                 Document doc = new Document();
                 doc.Add(NewTextField("id", Random.NextInt64() + "" + Random.NextInt64(), Field.Store.YES));
                 w.AddDocument(doc);
             }
 
-            IndexReader r = DirectoryReader.Open(w, true);
+            using IndexReader r = DirectoryReader.Open(w, true);
 
             // Make sure TMP always merged equal-number-of-docs segments:
             foreach (AtomicReaderContext ctx in r.Leaves)
@@ -303,9 +307,10 @@ public void TestUnbalancedMergeSelection()
                 Assert.IsTrue(numDocs == 100 || numDocs == 1000 || numDocs == 10000, $"got numDocs={numDocs}");
             }
 
-            r.Dispose();
-            w.Dispose();
-            dir.Dispose();
+            // LUCENENET: disposed via `using` statement
+            // r.Dispose();
+            // w.Dispose();
+            // dir.Dispose();
         }
     }
 }

src/Lucene.Net.Tests/Util/TestOfflineSorter.cs

@@ -311,5 +311,27 @@ public virtual void TestRamBuffer()
             Assert.Throws<ArgumentOutOfRangeException>(() => OfflineSorter.BufferSize.Megabytes(0), "min mb is 0.5");
             Assert.Throws<ArgumentOutOfRangeException>(() => OfflineSorter.BufferSize.Megabytes(-1), "min mb is 0.5");
         }
+
+        [Test, LuceneNetSpecific]
+        public void TestWrite_ArgumentValidation()
+        {
+            FileInfo file = new FileInfo(Path.Combine(tempDir.FullName, "testWrite_ArgumentValidation"));
+            using var stream = new FileStream(file.FullName, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.Read,
+                bufferSize: OfflineSorter.DEFAULT_FILESTREAM_BUFFER_SIZE, FileOptions.DeleteOnClose);
+            using OfflineSorter.ByteSequencesWriter w = new OfflineSorter.ByteSequencesWriter(stream, leaveOpen: true);
+
+            // ReSharper disable AccessToDisposedClosure
+            Assert.Throws<ArgumentNullException>(() => w.Write(((byte[])null)!));
+            Assert.Throws<ArgumentNullException>(() => w.Write(((BytesRef)null)!));
+            Assert.Throws<ArgumentOutOfRangeException>(() => w.Write([], -1, 1), "datum");
+            Assert.Throws<ArgumentOutOfRangeException>(() => w.Write([], 0, -1), "datum");
+            Assert.Throws<ArgumentException>(() => w.Write([], 0, 1), "datum");
+
+            // validate that len is less than or equal to short.MaxValue
+            var bigArray = new byte[short.MaxValue + 2]; // give extra space so that off <= bytes.Length - len
+            Assert.Throws<ArgumentOutOfRangeException>(() => w.Write(bigArray, 0, short.MaxValue + 1), "datum");
+            Assert.DoesNotThrow(() => w.Write(bigArray, 0, short.MaxValue));
+            // ReSharper restore AccessToDisposedClosure
+        }
     }
 }

src/Lucene.Net/Util/OfflineSorter.cs

@@ -670,7 +670,7 @@ public virtual void Write(byte[] bytes)
             /// by the bytes.
             /// </summary>
             /// <exception cref="ArgumentNullException"><paramref name="bytes"/> is <c>null</c>.</exception>
-            /// <exception cref="ArgumentOutOfRangeException"><paramref name="off"/> or <paramref name="len"/> is less than 0.</exception>
+            /// <exception cref="ArgumentOutOfRangeException"><paramref name="off"/> or <paramref name="len"/> is less than 0, or <paramref name="len"/> is greater than <see cref="short.MaxValue"/>.</exception>
             /// <exception cref="ArgumentException"><paramref name="off"/> and <paramref name="len"/> refer to a position outside of the array.</exception>
             public virtual void Write(byte[] bytes, int off, int len)
             {