Merge pull request #19 from InfiniteEnergy/prefix-match-bugs

bugfix *StartsWith* matchers
InfiniteEnergy · Apr 23, 2021 · 4bed2a7 · 4bed2a7
2 parents d9e7184 + df615eb
commit 4bed2a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/XlsxCompare.Tests/MatchByTests.cs b/src/XlsxCompare.Tests/MatchByTests.cs
@@ -17,9 +17,11 @@ public class MatchByTests
         [DataRow(MatchBy.Date, "2021-04-01", "04/01/2021")]
         [DataRow(MatchBy.Date, "2021-04-01 4:00AM", "04/01/2021")]
         [DataRow(MatchBy.StringLeftStartsWithRight, "asdf", "as")]
+        [DataRow(MatchBy.StringLeftStartsWithRight, "", "")]
         [DataRow(MatchBy.Decimal, "0.084400", "0.0844")]
         [DataRow(MatchBy.Decimal, "0.00", "0")]
         [DataRow(MatchBy.StringRightStartsWithLeft, "asdf", "asdf and then some")]
+        [DataRow(MatchBy.StringRightStartsWithLeft, "", "")]
         public void IsMatch_ThingsThatMatch_ReturnsTrue(MatchBy? match, string left, string right)
         {
             Assert.IsTrue(match.IsMatch(left, right));

diff --git a/src/XlsxCompare/MatchBy.cs b/src/XlsxCompare/MatchBy.cs
@@ -44,8 +44,12 @@ private static bool IsDateMatch(string left, string right)
                     && leftDate.Date == rightDate.Date);
 
         private static bool IsLeftStartsWithRightMatch(string left, string right)
-            => right.Length > 0
-                && left.StartsWith(right, StringComparison.OrdinalIgnoreCase);
+            => (left, right) switch
+            {
+                ("", "") => true, // both empty is a match
+                (_, "") => false, // left starting with empty doesn't count
+                (_, _) => left.StartsWith(right, StringComparison.OrdinalIgnoreCase),
+            };
 
         private static bool IsDecimalMatch(string left, string right)
             => IsStringMatch(left, right)