refactor: align API of shim with the built-in API. (#209)

skwasjer · Oct 3, 2024 · c6fc8e5 · c6fc8e5
1 parent b802059
commit c6fc8e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/IbanNet/Extensions/ChunkExtensions.cs b/src/IbanNet/Extensions/ChunkExtensions.cs
@@ -17,7 +17,7 @@ internal static class ChunkExtensions
     /// <param name="source">The source sequence.</param>
     /// <param name="size">The size of each chunk to split the <paramref name="source" /> into.</param>
     /// <returns>an enumerable of chunks</returns>
-    public static IEnumerable<IEnumerable<TSource>> Chunk<TSource>(this IEnumerable<TSource> source, int size)
+    public static IEnumerable<TSource[]> Chunk<TSource>(this IEnumerable<TSource> source, int size)
     {
         if (source is null)
         {
@@ -32,23 +32,23 @@ public static IEnumerable<IEnumerable<TSource>> Chunk<TSource>(this IEnumerable<
         return ChunkIterator(source, size);
     }
 
-    private static IEnumerable<IEnumerable<TSource>> ChunkIterator<TSource>(this IEnumerable<TSource> source, int size)
+    private static IEnumerable<TSource[]> ChunkIterator<TSource>(this IEnumerable<TSource> source, int size)
     {
         var chunks = new List<TSource>(size);
         foreach (TSource item in source)
         {
             chunks.Add(item);
             if (chunks.Count == size)
             {
-                yield return chunks;
+                yield return chunks.ToArray();
 
-                chunks = new List<TSource>(size);
+                chunks.Clear();
             }
         }
 
         if (chunks.Count > 0)
         {
-            yield return chunks;
+            yield return chunks.ToArray();
         }
     }
 #endif

diff --git a/test/IbanNet.Tests/Extensions/ChunkExtensionsTests.cs b/test/IbanNet.Tests/Extensions/ChunkExtensionsTests.cs
@@ -48,12 +48,7 @@ public void Given_collection_when_chunking_it_should_return_expected_chunks(int
         actual.Should().HaveCount(expectedPartitions);
         actual.Take(actual.Count - 1)
             .Should()
-            .OnlyContain(inner =>
-#if NET6_0_OR_GREATER
-                        inner.Length == size,
-#else
-                    inner.Count() == size,
-#endif
+            .OnlyContain(inner => inner.Length == size,
                 "all but the last should at least be of the requested size"
             );
         actual.Last().Should().HaveCount(expectedLastPartitionSize, "the last partition can be less than or equal to the requested size");