Merge branch 'main' into release/v1.3.0-preview.1

pfpack · Sep 14, 2023 · 0140e7f · 0140e7f
2 parents 2a87476 + 7a2c71e
commit 0140e7f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Functional/Filter.Index.cs b/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Functional/Filter.Index.cs
@@ -64,14 +64,28 @@ public static void FilterWithIndex_SourceIsNotEmptyAndNotAllPredicatesReturnFals
             { UpperAnotherString, true },
             { WhiteSpaceString, true },
             { AnotherString, false },
-            { TabString, true }
+            { TabString, true },
+            { LowerAnotherString, true },
+            { LowerSomeString, false },
+            { MixedWhiteSpacesString, true }
+        };
+
+        var sourceItems = new[]
+        {
+            EmptyString,
+            SomeString,
+            UpperAnotherString,
+            WhiteSpaceString,
+            AnotherString,
+            TabString,
+            LowerAnotherString,
+            LowerSomeString
         };
 
-        var sourceItems = new[] { EmptyString, SomeString, UpperAnotherString, WhiteSpaceString, AnotherString };
         var source = mapper.Keys.ToArray().InitializeFlatArray(sourceItems.Length);
 
         var actual = source.Filter(Predicate);
-        var expectedItems = new[] { EmptyString, UpperAnotherString, WhiteSpaceString };
+        var expectedItems = new[] { EmptyString, UpperAnotherString, WhiteSpaceString, TabString, LowerAnotherString };
 
         actual.VerifyTruncatedState(expectedItems);
 

diff --git a/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Functional/Filter.cs b/src/flatcollections-array/FlatArray.Tests/Tests.FlatArray.T/Functional/Filter.cs
@@ -63,13 +63,16 @@ public static void Filter_SourceIsNotEmptyAndNotAllPredicatesReturnFalse_ExpectF
             { Zero, true },
             { MinusOne, true },
             { One, false },
+            { int.MinValue, true },
+            { 75, true },
+            { int.MaxValue, false },
             { PlusFifteen, true }
         };
 
-        var source = mapper.Keys.ToArray().InitializeFlatArray(4);
+        var source = mapper.Keys.ToArray().InitializeFlatArray(mapper.Count);
 
         var actual = source.Filter(Predicate);
-        var expectedItems = new[] { Zero, MinusOne };
+        var expectedItems = new[] { Zero, MinusOne, int.MinValue, 75, PlusFifteen };
 
         actual.VerifyTruncatedState(expectedItems);
 

diff --git a/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Functional.Filter.cs b/src/flatcollections-array/FlatArray/FlatArray.T/FlatArray.Functional.Filter.cs
@@ -31,7 +31,7 @@ public FlatArray<T> Filter(Func<T, bool> predicate)
 
             resultItems[resultLength++] = items![counter];
         }
-        while (++counter < resultItems.Length);
+        while (++counter < length);
 
         if (resultLength == default)
         {
@@ -70,7 +70,7 @@ public FlatArray<T> Filter(Func<T, int, bool> predicate)
 
             resultItems[resultLength++] = items![counter];
         }
-        while (++counter < resultItems.Length);
+        while (++counter < length);
 
         if (resultLength == default)
         {

diff --git a/src/flatcollections-array/FlatArray/FlatArray.csproj b/src/flatcollections-array/FlatArray/FlatArray.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Core.FlatArray is a core library for .NET consisting of immutable FlatArray targeted for use in functional programming.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>PrimeFuncPack.Core.FlatArray</AssemblyName>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/flatcollections/FlatCollections/FlatCollections.csproj b/src/flatcollections/FlatCollections/FlatCollections.csproj
@@ -17,7 +17,7 @@
     <Description>PrimeFuncPack Core.FlatCollections is a set of immutable Flat collections for .NET designed for developing business applications based on functional programming.</Description>
     <RootNamespace>System</RootNamespace>
     <AssemblyName>PrimeFuncPack.Core.FlatCollections</AssemblyName>
-    <Version>1.2.0</Version>
+    <Version>1.2.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.2.0" />
+    <PackageReference Include="PrimeFuncPack.Core.FlatArray" Version="1.2.1" />
   </ItemGroup>
 
 </Project>