Change CheckChars() to work without ignore char + tests

Coding-Enthusiast · Oct 21, 2023 · 3f42d4d · 3f42d4d
1 parent 8755b01
commit 3f42d4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Src/FinderOuter/Services/InputService.cs b/Src/FinderOuter/Services/InputService.cs
@@ -36,13 +36,13 @@ public static bool TryGetCompareService(CompareInputType inType, string input, o
         public static bool IsMissingCharValid(char c) => ConstantsFO.MissingSymbols.Contains(c);
 
 
-        public static bool CheckChars(ReadOnlySpan<char> array, ReadOnlySpan<char> charSet, char ignore, out string error)
+        public static bool CheckChars(ReadOnlySpan<char> array, ReadOnlySpan<char> charSet, char? ignore, out string error)
         {
             bool isValid = true;
             error = string.Empty;
             for (int i = 0; i < array.Length; i++)
             {
-                if (!charSet.Contains(array[i]) && array[i] != ignore)
+                if (!charSet.Contains(array[i]) && (!ignore.HasValue || array[i] != ignore.Value))
                 {
                     isValid = false;
                     if (!string.IsNullOrEmpty(error))
@@ -249,7 +249,7 @@ public static bool IsValidWif(string key, out string message)
                 message = "Could not decode the given key.";
                 return false;
             }
-            
+
             if (keyBa[0] != ConstantsFO.PrivKeyFirstByte)
             {
                 message = $"Invalid first key byte (actual={keyBa[0]}, expected={ConstantsFO.PrivKeyFirstByte}).";

diff --git a/Src/Tests/Services/InputServiceTests.cs b/Src/Tests/Services/InputServiceTests.cs
@@ -92,10 +92,12 @@ public static IEnumerable<object[]> GetCheckCharsCases()
             yield return new object[] { "a ", "abcde", '*', false, "Invalid character \" \" found at index=1." };
             yield return new object[] { "a*b", "abcde", '*', true, "" };
             yield return new object[] { "***", "abcde", '*', true, "" };
+            yield return new object[] { "ab", "abcde", null, true, "" };
+            yield return new object[] { "ab*", "abcde", null, false, "Invalid character \"*\" found at index=2." };
         }
         [Theory]
         [MemberData(nameof(GetCheckCharsCases))]
-        public void CheckCharsTest(string input, string charSet, char ignore, bool expected, string expErr)
+        public void CheckCharsTest(string input, string charSet, char? ignore, bool expected, string expErr)
         {
             bool actual = InputService.CheckChars(input, charSet, ignore, out string error);
             Assert.Equal(expected, actual);