Fix Units for Span.Contains (dotnet/corefx#32362)

* Fix typo

* Remove redunant test

* Test cases may generate XUnit name duplicates

Commit migrated from https://github.com/dotnet/corefx/commit/5f7e07f42443c1d62e72068e8ccda75d1911d9f2

diff --git a/src/libraries/System.Globalization/tests/Performance/Perf.CompareInfo.cs b/src/libraries/System.Globalization/tests/Performance/Perf.CompareInfo.cs
index a6e4058..6f56fcf 100644 (file)
--- a/src/libraries/System.Globalization/tests/Performance/Perf.CompareInfo.cs
+++ b/src/libraries/System.Globalization/tests/Performance/Perf.CompareInfo.cs
@@ -32,8 +32,8 @@ namespace System.Globalization.Tests
             new object[] { "es-ES", "$", "&", CompareOptions.IgnoreSymbols },
             new object[] { "", GenerateInputString('A', 10, '5', 5), GenerateInputString('A', 10, '5', 6), CompareOptions.Ordinal },
             new object[] { "", GenerateInputString('A', 100, 'X', 70), GenerateInputString('A', 100, 'X', 70), CompareOptions.OrdinalIgnoreCase },
-            new object[] { "ja-JP", GenerateInputString('A', 100, 'X', 70), GenerateInputString('A', 100, 'x', 70), CompareOptions.OrdinalIgnoreCase },
-            new object[] { "en-US", GenerateInputString('A', 1000, 'X', 500), GenerateInputString('A', 1000, 'X', 500), CompareOptions.None },
+            new object[] { "ja-JP", GenerateInputString('A', 100, 'D', 70), GenerateInputString('A', 100, 'd', 70), CompareOptions.OrdinalIgnoreCase },
+            new object[] { "en-US", GenerateInputString('A', 1000, 'G', 500), GenerateInputString('A', 1000, 'G', 500), CompareOptions.None },
             new object[] { "en-US", GenerateInputString('\u3060', 1000, 'x', 500), GenerateInputString('\u3060', 1000, 'x', 10), CompareOptions.None },
             new object[] { "es-ES", GenerateInputString('\u3060', 100, '\u3059', 50), GenerateInputString('\u3060', 100, '\u3059', 50), CompareOptions.Ordinal },
             new object[] { "tr-TR", GenerateInputString('\u3060', 5000, '\u3059', 2501), GenerateInputString('\u3060', 5000, '\u3059', 2500), CompareOptions.Ordinal }

diff --git a/src/libraries/System.Memory/tests/Performance/Perf.Span.Contains.cs b/src/libraries/System.Memory/tests/Performance/Perf.Span.Contains.cs
index 859d00a..7c5a0b6 100644 (file)
--- a/src/libraries/System.Memory/tests/Performance/Perf.Span.Contains.cs
+++ b/src/libraries/System.Memory/tests/Performance/Perf.Span.Contains.cs
@@ -187,7 +187,7 @@ namespace System.Memory.Tests
         {
             new object[] { "string1", '1' },
             new object[] { "foobardzsdzs", 'z' },
-            new object[] { "StrIng", "I" },
+            new object[] { "StrIng", 'I' },
             new object[] { "\u3060", '\u305F' },
             new object[] { "ABCDE", 'c' },
             new object[] { "More Test's", '\'' },
@@ -196,8 +196,7 @@ namespace System.Memory.Tests
             new object[] { "Hello Worldbbbbbbbbbbbbbbcbbbbbbbbbbbbbbbbbbba!", 'y' },
             new object[] { GenerateInputString('A', 10, '5', 5), '5' },
             new object[] { GenerateInputString('A', 100, 'X', 70), 'x' },
-            new object[] { GenerateInputString('A', 100, 'X', 70), 'x' },
-            new object[] { GenerateInputString('A', 1000, 'X', 500), 'X' },
+            new object[] { GenerateInputString('A', 1000, 'G', 500), 'G' },
             new object[] { GenerateInputString('\u3060', 1000, 'x', 500), 'x' },
             new object[] { GenerateInputString('\u3060', 100, '\u3059', 50), '\u3059' }
         };

diff --git a/src/libraries/System.Memory/tests/Performance/Perf.Span.IndexOf.cs b/src/libraries/System.Memory/tests/Performance/Perf.Span.IndexOf.cs
index 9f124d3..b80d4fb 100644 (file)
--- a/src/libraries/System.Memory/tests/Performance/Perf.Span.IndexOf.cs
+++ b/src/libraries/System.Memory/tests/Performance/Perf.Span.IndexOf.cs
@@ -190,8 +190,8 @@ namespace System.Memory.Tests
             new object[] { "Hello Worldbbbbbbbbbbbbbbcbbbbbbbbbbbbbbbbbbba!", "y", StringComparison.Ordinal },
             new object[] { GenerateInputString('A', 10, '5', 5), "5", StringComparison.InvariantCulture },
             new object[] { GenerateInputString('A', 100, 'X', 70), "x", StringComparison.InvariantCultureIgnoreCase },
-            new object[] { GenerateInputString('A', 100, 'X', 70), "x", StringComparison.OrdinalIgnoreCase },
-            new object[] { GenerateInputString('A', 1000, 'X', 500), "X", StringComparison.Ordinal },
+            new object[] { GenerateInputString('A', 100, 'D', 70), "d", StringComparison.OrdinalIgnoreCase },
+            new object[] { GenerateInputString('A', 1000, 'G', 500), "G", StringComparison.Ordinal },
             new object[] { GenerateInputString('\u3060', 1000, 'x', 500), "x", StringComparison.Ordinal },
             new object[] { GenerateInputString('\u3060', 100, '\u3059', 50), "\u3059", StringComparison.Ordinal }
         };