Added StringComparison to extension to handle more specific string co…

…mparisons. Updated all usages. Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
dapr · Sep 26, 2024 · e819dee · e819dee
1 parent 78e98c8
commit e819dee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Dapr.Jobs/Extensions/StringExtensions.cs b/src/Dapr.Jobs/Extensions/StringExtensions.cs
@@ -20,6 +20,8 @@ internal static class StringExtensions
     /// </summary>
     /// <param name="value">The string value to evaluate.</param>
     /// <param name="possibleValues">The possible values to look for a match within.</param>
-    /// <returns></returns>
-    public static bool EndsWithAny(this string value, IReadOnlyList<string> possibleValues) => possibleValues.Any(value.EndsWith);
+    /// <param name="comparisonType">The type of string comparison to perform.</param>
+    /// <returns>True if the value ends with any of the possible values; otherwise false.</returns>
+    public static bool EndsWithAny(this string value, IReadOnlyList<string> possibleValues,
+        StringComparison comparisonType) => possibleValues.Any(val => value.EndsWith(val, comparisonType));
 }
diff --git a/src/Dapr.Jobs/Models/DaprJobSchedule.cs b/src/Dapr.Jobs/Models/DaprJobSchedule.cs
@@ -124,7 +124,7 @@ public static DaprJobSchedule FromDuration(TimeSpan duration)
     public bool IsPrefixedPeriodExpression =>
         ExpressionValue.StartsWith('@') &&
         (isEveryExpression.IsMatch(ExpressionValue) ||
-         ExpressionValue.EndsWithAny(acceptablePeriodValues));
+         ExpressionValue.EndsWithAny(acceptablePeriodValues, StringComparison.InvariantCulture));
 
     /// <summary>
     /// Reflects that the schedule represents a fixed point in time.

diff --git a/test/Dapr.Jobs.Test/Extensions/StringExtensionsTests.cs b/test/Dapr.Jobs.Test/Extensions/StringExtensionsTests.cs
@@ -11,6 +11,7 @@
 // limitations under the License.
 // ------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 using Dapr.Jobs.Extensions;
 using Xunit;
@@ -31,15 +32,15 @@ public void EndsWithAny_ContainsMatch()
             "daily",
             "midnight",
             "hourly"
-        });
+        }, StringComparison.InvariantCulture);
         Assert.True(result);
     }
 
     [Fact]
     public void EndsWithAny_DoesNotContainMatch()
     {
         const string testValue = "@weekly";
-        var result = testValue.EndsWithAny(new List<string> { "every", "monthly", "daily", "midnight", "hourly" });
+        var result = testValue.EndsWithAny(new List<string> { "every", "monthly", "daily", "midnight", "hourly" }, StringComparison.InvariantCulture);
         Assert.False(result);
     }
 }