ft: finalize changes to char limit

bolorundurowb · Aug 25, 2020 · 0c75674 · 0c75674
1 parent c941763
commit 0c75674
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/shortid.Test/ShortId.Tests.cs b/shortid.Test/ShortId.Tests.cs
@@ -65,13 +65,13 @@ public void SetSeedThrowsWhenCharacterSetIsLessThan20Characters()
                 .Should()
                 .Throw<InvalidOperationException>()
                 .WithMessage(
-                    "The replacement characters must be at least 20 letters in length and without whitespace.");
+                    "The replacement characters must be at least 50 letters in length and without whitespace.");
         }
 
         [Fact]
         public void SetSeedWorksWithValidCharSet()
         {
-            const string seed = "783ujrcuei039jhbewqoiewoiehjsbsahauwiwGHDEWIUkj4";
+            const string seed = "ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ①②③④⑤⑥⑦⑧⑨⑩⑪⑫";
             Action action = () => { ShortId.SetCharacters(seed); };
 
             action

diff --git a/shortid/ShortId.cs b/shortid/ShortId.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Text;
 using shortid.Configuration;
 using shortid.Utils;
@@ -132,24 +133,21 @@ public static void SetCharacters(string characters)
                 throw new ArgumentException("The replacement characters must not be null or empty.");
             }
 
-            var stringBuilder = new StringBuilder();
-            foreach (var character in characters)
-            {
-                if (!char.IsWhiteSpace(character))
-                {
-                    stringBuilder.Append(character);
-                }
-            }
+            var charSet = characters
+                .ToCharArray()
+                .Where(x => !char.IsWhiteSpace(x))
+                .Distinct()
+                .ToArray();
 
-            if (stringBuilder.Length < Constants.MinimumCharacterSetLength)
+            if (charSet.Length < Constants.MinimumCharacterSetLength)
             {
                 throw new InvalidOperationException(
                     $"The replacement characters must be at least {Constants.MinimumCharacterSetLength} letters in length and without whitespace.");
             }
 
             lock (ThreadLock)
             {
-                _pool = stringBuilder.ToString();
+                _pool = new string(charSet);
             }
         }