Initial RecyclableLongList.InsertRange() implementation. Before optimization.

Recyclable.Collections/RecyclableLongList.AddRange.cs

@@ -32,7 +32,7 @@ namespace Recyclable.Collections
 			{
 				if (copied + blockSize > capacity)
 				{
-					capacity = RecyclableLongList<T>.Helpers.Resize(targetList, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)(capacity + blockSize))));
+					capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)(capacity + blockSize))));
 					memoryBlocksSpan = targetList._memoryBlocks;
 					available = capacity - copied;
 				}
@@ -45,7 +45,7 @@ namespace Recyclable.Collections
 					if (!enumerator.MoveNext())
 					{
 						targetList._lastBlockWithData = targetBlockIdx;
-						targetList._longCount += copied + i - targetList._longCount;
+						targetList._longCount = copied + i;
 						if (targetItemIdx < blockSize)
 						{
 							targetList._nextItemBlockIndex = targetBlockIdx;
@@ -93,7 +93,7 @@ namespace Recyclable.Collections
 
 			if (targetList._capacity < requiredCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)requiredCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)requiredCapacity)));
 			}
 
 			ReadOnlySpan<T[]> memoryBlocksSpan = targetList._memoryBlocks;
@@ -137,7 +137,7 @@ namespace Recyclable.Collections
 
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			ReadOnlySpan<T[]> memoryBlocksSpan = targetList._memoryBlocks;
@@ -186,7 +186,7 @@ namespace Recyclable.Collections
 			long targetCapacity = targetList._longCount + items.Count;
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			// We're better off to temporarily copy it to a fixed array,
@@ -252,7 +252,7 @@ namespace Recyclable.Collections
 			long targetCapacity = targetList._longCount + items.Count;
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			// We're better off to temporarily copy it to a fixed array,
@@ -332,7 +332,7 @@ namespace Recyclable.Collections
 			{
 				if (copied + blockSize > capacity)
 				{
-					capacity = RecyclableLongList<T>.Helpers.Resize(targetList, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)(capacity + blockSize))));
+					capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)(capacity + blockSize))));
 					memoryBlocksSpan = targetList._memoryBlocks;
 					available = capacity - copied;
 				}
@@ -345,7 +345,7 @@ namespace Recyclable.Collections
 					if (!enumerator.MoveNext())
 					{
 						targetList._lastBlockWithData = targetBlockIdx;
-						targetList._longCount += copied + i - targetList._longCount;
+						targetList._longCount = copied + i;
 						if (targetItemIdx < blockSize)
 						{
 							targetList._nextItemBlockIndex = targetBlockIdx;
@@ -445,7 +445,7 @@ namespace Recyclable.Collections
 
 			if (targetList._capacity < requiredCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)requiredCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)requiredCapacity)));
 			}
 
 			ReadOnlySpan<T[]> memoryBlocksSpan = targetList._memoryBlocks;
@@ -488,7 +488,7 @@ namespace Recyclable.Collections
 			long targetCapacity = targetList._longCount + items.Count;
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			ReadOnlySpan<T[]> memoryBlocksSpan = targetList._memoryBlocks;
@@ -534,7 +534,7 @@ namespace Recyclable.Collections
 			long targetCapacity = targetList._longCount + items.Length;
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			ReadOnlySpan<T[]> memoryBlocksSpan = targetList._memoryBlocks;
@@ -589,7 +589,7 @@ namespace Recyclable.Collections
 			long targetCapacity = targetList._longCount + items._count;
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			ReadOnlySpan<T> itemsSpan = new(items._memoryBlock, 0, items._count);
@@ -651,7 +651,7 @@ namespace Recyclable.Collections
 
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			ReadOnlySpan<T[]> sourceMemoryBlocksSpan = items._memoryBlocks;
@@ -719,7 +719,7 @@ namespace Recyclable.Collections
 
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			ReadOnlySpan<T[]> memoryBlocksSpan = targetList._memoryBlocks;
@@ -774,7 +774,7 @@ namespace Recyclable.Collections
 			long targetCapacity = targetList._longCount + items.LongLength;
 			if (targetList._capacity < targetCapacity)
 			{
-				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(targetList, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
+				targetList._capacity = RecyclableLongList<T>.Helpers.Resize(ref targetList._memoryBlocks, targetList._blockSize, targetList._blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)targetCapacity)));
 			}
 
 			ReadOnlySpan<T> itemsSpan = items;

Recyclable.Collections/RecyclableLongList.Helpers.cs

@@ -142,9 +142,9 @@ namespace Recyclable.Collections
 			/// </remarks>
 			/// <returns>The maximum no. of items <paramref name="list"/> can store.</returns>
 			[MethodImpl(MethodImplOptions.NoInlining | MethodImplOptions.AggressiveOptimization)]
-			public static long Resize(RecyclableLongList<T> list, int minBlockSize, byte minBlockSizePow2Shift, long newCapacity)
+			public static long Resize(ref T[][] memoryBlocks, int minBlockSize, byte minBlockSizePow2Shift, long newCapacity)
 			{
-				int sourceBlockCount = list._memoryBlocks?.Length ?? 0;
+				int sourceBlockCount = memoryBlocks?.Length ?? 0;
 				int requiredBlockCount = checked((int)(newCapacity >> minBlockSizePow2Shift) + ((newCapacity & (minBlockSize - 1)) != 0 ? 1 : 0));
 				int blockIndex;
 
@@ -157,19 +157,19 @@ namespace Recyclable.Collections
 					// Copy arrays from the old memory block for all arrays
 					if (sourceBlockCount > 0)
 					{
-						Array.Copy(list._memoryBlocks!, newMemoryBlocks, sourceBlockCount);
+						Array.Copy(memoryBlocks!, newMemoryBlocks, sourceBlockCount);
 						// We can now return the old memory block for all arrays itself
 						if (sourceBlockCount >= RecyclableDefaults.MinPooledArrayLength)
 						{
-							RecyclableArrayPool<T[]>.ReturnShared(list._memoryBlocks!, true);
+							RecyclableArrayPool<T[]>.ReturnShared(memoryBlocks!, true);
 						}
 					}
 
-					list._memoryBlocks = newMemoryBlocks;
+					memoryBlocks = newMemoryBlocks;
 				}
 				else
 				{
-					newMemoryBlocks = list._memoryBlocks!;
+					newMemoryBlocks = memoryBlocks!;
 				}
 
 				// Allocate arrays for any new blocks

Recyclable.Collections/RecyclableLongList.cs

@@ -40,7 +40,7 @@ namespace Recyclable.Collections
 				_version++;
 				if (_capacity != value)
 				{
-					_capacity = Helpers.Resize(this, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)value)));
+					_capacity = Helpers.Resize(ref _memoryBlocks, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)value)));
 					_version++;
 				}
 			}
@@ -62,7 +62,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)initialCapacity)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)initialCapacity)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 		}
@@ -75,7 +75,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.LongLength)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.LongLength)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -90,7 +90,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.LongLength)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.LongLength)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -105,7 +105,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -120,7 +120,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Length)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Length)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -135,7 +135,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -150,7 +150,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -165,7 +165,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Length)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Length)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -180,7 +180,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -195,7 +195,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -210,7 +210,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)source.Count)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -225,7 +225,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)initialCapacity)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)initialCapacity)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -240,7 +240,7 @@ namespace Recyclable.Collections
 			}
 
 			_blockSizePow2BitShift = (byte)(31 - BitOperations.LeadingZeroCount((uint)minBlockSize));
-			_capacity = Helpers.Resize(this, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)initialCapacity)));
+			_capacity = Helpers.Resize(ref _memoryBlocks, minBlockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)initialCapacity)));
 			_blockSize = minBlockSize;
 			_blockSizeMinus1 = minBlockSize - 1;
 
@@ -274,7 +274,7 @@ namespace Recyclable.Collections
 		{
 			if (_capacity < _longCount + 1)
 			{
-				_capacity = Helpers.Resize(this, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)(_longCount + 1))));
+				_capacity = Helpers.Resize(ref _memoryBlocks, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)(_longCount + 1))));
 			}
 
 			_memoryBlocks[_nextItemBlockIndex][_nextItemIndex++] = item;
@@ -505,7 +505,7 @@ namespace Recyclable.Collections
 
 			if (_capacity < ++_longCount)
 			{
-				_capacity = Helpers.Resize(this, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)_longCount)));
+				_capacity = Helpers.Resize(ref _memoryBlocks, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)_longCount)));
 			}
 
 			if (index + 1 < _longCount)
@@ -544,7 +544,7 @@ namespace Recyclable.Collections
 
 			if (_capacity < ++_longCount)
 			{
-				_capacity = Helpers.Resize(this, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)_longCount)));
+				_capacity = Helpers.Resize(ref _memoryBlocks, _blockSize, _blockSizePow2BitShift, checked((long)BitOperations.RoundUpToPowerOf2((ulong)_longCount)));
 			}
 
 			if (index + 1 < _longCount)

Recyclable.CollectionsTests/Recyclable.CollectionsTests.csproj

@@ -16,8 +16,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Recyclable.Collections.TestData" Version="0.0.3.4" />
-    <PackageReference Include="Recyclable.Collections.TestData.xUnit" Version="0.0.0.1" />
+    <PackageReference Include="Recyclable.Collections.TestData" Version="0.0.3.5" />
+    <PackageReference Include="Recyclable.Collections.TestData.xUnit" Version="0.0.0.2" />
     <PackageReference Include="xunit" Version="2.6.4" />
     <PackageReference Include="xunit.runner.console" Version="2.6.4">
       <PrivateAssets>all</PrivateAssets>

Recyclable.CollectionsTests/RecyclableLongList.Helpers.Tests.cs

@@ -1,100 +0,0 @@
-using FluentAssertions;
-using Recyclable.Collections;
-using Recyclable.Collections.TestData.xUnit;
-using System.Collections;
-
-namespace Recyclable.CollectionsTests
-{
-
-	public class RecyclableLongListHelperTests
-	{
-		[Theory]
-		[ClassData(typeof(SourceDataWithBlockSizeWithItemIndexWithRangeTheoryData))]
-		public void MakeRoomAndSetShouldMoveItems(string testCase, IEnumerable<long> testData, int itemsCount, int minBlockSize, in (long ItemIndex, long RangedItemsCount)[] itemRanges)
-		{
-			// Prepare
-			var expectedData = testData.Reverse().ToArray();
-
-			foreach ((var itemIndex, var rangedItemsCount) in itemRanges)
-			{
-				using var list = new RecyclableLongList<long>(testData.Reverse(), minBlockSize, itemsCount);
-				var expected = expectedData.ToList();
-				var rangedTestData = expected.GetRange((int)itemIndex, (int)rangedItemsCount).ToArray();
-				expected.InsertRange((int)itemIndex, rangedTestData);
-
-				if (testCase.Contains("Array[", StringComparison.OrdinalIgnoreCase))
-				{
-					list.InsertRange((int)itemIndex, rangedTestData);
-				}
-				else if (testCase.Contains("ICollection[", StringComparison.OrdinalIgnoreCase))
-				{
-					return;
-					//list.InsertRange((int)itemIndex, (ICollection)testData);
-				}
-				else if (testCase.Contains("ICollection<T>[", StringComparison.OrdinalIgnoreCase))
-				{
-					return;
-					//list.InsertRange((int)itemIndex, (ICollection<long>)testData);
-				}
-				else if (testCase.Contains("IEnumerable[", StringComparison.OrdinalIgnoreCase))
-				{
-					return;
-					//list.InsertRange((int)itemIndex, (IEnumerable)testData);
-				}
-				else if (testCase.Contains("IReadOnlyList<T>[", StringComparison.OrdinalIgnoreCase))
-				{
-					return;
-					//list.InsertRange((int)itemIndex, (IReadOnlyList<long>)testData);
-				}
-				else if (testCase.Contains("ReadOnlySpan<T>[", StringComparison.OrdinalIgnoreCase))
-				{
-					return;
-					//list.InsertRange((int)itemIndex, new ReadOnlySpan<long>((long[])testData));
-				}
-				else if (testCase.Contains("Span<T>[", StringComparison.OrdinalIgnoreCase))
-				{
-					return;
-					//list.InsertRange((int)itemIndex, new Span<long>((long[])testData));
-				}
-				else if (testData is long[] testDataArray)
-				{
-					return;
-					//list.InsertRange((int)itemIndex, testDataArray);
-				}
-				else if (testData is List<long> testDataList)
-				{
-					return;
-					//list.InsertRange((int)itemIndex, testDataList);
-				}
-				else if (testData is RecyclableList<long> testDataRecyclableList)
-				{
-					return;
-					//list.InsertRange((int)itemIndex, testDataRecyclableList);
-				}
-				else if (testData is RecyclableLongList<long> testDataRecyclableLongList)
-				{
-					return;
-					//list.InsertRange((int)itemIndex, testDataRecyclableLongList);
-				}
-				else if (testData is IList<long> testDataIList)
-				{
-					return;
-					//list.InsertRange((int)itemIndex, testDataIList);
-				}
-				else if (testData is IEnumerable<long> testDataIEnumerable)
-				{
-					return;
-					//list.InsertRange((int)itemIndex, testDataIEnumerable);
-				}
-				else
-				{
-					throw new InvalidCastException("Unknown type of test data");
-				}
-
-				// Validate
-				list.Count.Should().Be(expected.Count);
-				_ = list.Should().Equal(expected);
-			}
-		}
-	}
-}

Recyclable.CollectionsTests/RecyclableLongListTests.cs

@@ -998,6 +998,85 @@ namespace Recyclable.CollectionsTests
 			}
 		}
 
+		[Theory]
+		[ClassData(typeof(SourceDataWithBlockSizeWithItemIndexWithRangeTheoryData))]
+		public void InsertRangeShouldMoveItems(string testCase, IEnumerable<long> testData, int itemsCount, int minBlockSize, in (long ItemIndex, long RangedItemsCount)[] itemRanges)
+		{
+			// Prepare
+			var expectedData = testData.Reverse().ToArray();
+
+			foreach ((var itemIndex, var rangedItemsCount) in itemRanges)
+			{
+				using var list = new RecyclableLongList<long>(testData.Reverse(), minBlockSize, itemsCount);
+				var expected = expectedData.ToList();
+				var rangedTestData = expected.GetRange((int)itemIndex, (int)rangedItemsCount).ToArray();
+				expected.InsertRange((int)itemIndex, rangedTestData);
+
+				if (testCase.Contains("Array[", StringComparison.OrdinalIgnoreCase))
+				{
+					list.InsertRange((int)itemIndex, (Array)rangedTestData);
+				}
+				else if (testCase.Contains("ICollection[", StringComparison.OrdinalIgnoreCase))
+				{
+					list.InsertRange((int)itemIndex, (ICollection)rangedTestData);
+				}
+				else if (testCase.Contains("ICollection<T>[", StringComparison.OrdinalIgnoreCase))
+				{
+					list.InsertRange((int)itemIndex, (ICollection<long>)rangedTestData);
+				}
+				else if (testCase.Contains("IEnumerable[", StringComparison.OrdinalIgnoreCase))
+				{
+					list.InsertRange((int)itemIndex, (IEnumerable)rangedTestData);
+				}
+				else if (testCase.Contains("IReadOnlyList<T>[", StringComparison.OrdinalIgnoreCase))
+				{
+					list.InsertRange((int)itemIndex, (IReadOnlyList<long>)rangedTestData);
+				}
+				else if (testCase.Contains("ReadOnlySpan<T>[", StringComparison.OrdinalIgnoreCase))
+				{
+					list.InsertRange((int)itemIndex, new ReadOnlySpan<long>(rangedTestData));
+				}
+				else if (testCase.Contains("Span<T>[", StringComparison.OrdinalIgnoreCase))
+				{
+					list.InsertRange((int)itemIndex, new Span<long>(rangedTestData));
+				}
+				else if (testData is long[] testDataArray)
+				{
+					list.InsertRange((int)itemIndex, rangedTestData);
+				}
+				else if (testData is List<long> testDataList)
+				{
+					list.InsertRange((int)itemIndex, rangedTestData.ToList());
+				}
+				else if (testData is RecyclableList<long> testDataRecyclableList)
+				{
+					using RecyclableList<long> rangedTestDataRecyclableList = rangedTestData.ToRecyclableList();
+					list.InsertRange((int)itemIndex, rangedTestDataRecyclableList);
+				}
+				else if (testData is RecyclableLongList<long> testDataRecyclableLongList)
+				{
+					using RecyclableLongList<long> rangedTestDataRecyclableList = rangedTestData.ToRecyclableLongList();
+					list.InsertRange((int)itemIndex, rangedTestDataRecyclableList);
+				}
+				else if (testData is IList<long> testDataIList)
+				{
+					list.InsertRange((int)itemIndex, (IList<long>)rangedTestData);
+				}
+				else if (testData is IEnumerable<long> testDataIEnumerable)
+				{
+					list.InsertRangeEnumerated((int)itemIndex, (IEnumerable<long>)rangedTestData);
+				}
+				else
+				{
+					throw new InvalidCastException("Unknown type of test data");
+				}
+
+				// Validate
+				list.Count.Should().Be(expected.Count);
+				_ = list.Should().Equal(expected);
+			}
+		}
+
 		[Theory]
 		[ClassData(typeof(SourceDataWithBlockSizeWithItemIndexTheoryData))]
 		public void InsertShouldMoveItemsWhenLong(string testCase, IEnumerable<long> testData, long itemsCount, int targetBlockSize, in long[] itemIndexes)