[release/5.0] Handle non-ASCII strings in GetNonRandomizedHashCodeOrd…

…inalIgnoreCase (#45062) * Backports #44681 fix to 5.0 * Backports #44695 fix to 5.0
dotnet · Nov 24, 2020 · d9a4a64 · d9a4a64
1 parent 90b8f7e
commit d9a4a64
Show file tree

Hide file tree

Showing 4 changed files with 229 additions and 107 deletions.
diff --git a/src/libraries/System.Collections/tests/Generic/Dictionary/Dictionary.Tests.cs b/src/libraries/System.Collections/tests/Generic/Dictionary/Dictionary.Tests.cs
@@ -337,6 +337,22 @@ public void CantAcceptDuplicateKeysFromSourceDictionary()
             AssertExtensions.Throws<ArgumentException>(null, () => new Dictionary<string, int>(source, StringComparer.OrdinalIgnoreCase));
         }
 
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotInvariantGlobalization))]
+        // https://github.com/dotnet/runtime/issues/44681
+        public void DictionaryOrdinalIgnoreCaseCyrillicKeys()
+        {
+            const string Lower = "абвгдеёжзийклмнопрстуфхцчшщьыъэюя";
+            const string Higher = "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЬЫЪЭЮЯ";
+
+            var dictionary = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+
+            for (int i = 0; i < Lower.Length; i++)
+            {
+                dictionary[Lower[i].ToString()] = i;
+                Assert.Equal(i, dictionary[Higher[i].ToString()]);
+            }
+        }
+
         public static IEnumerable<object[]> CopyConstructorStringComparerData
         {
             get