WASM Enable System.Collections tests (#38976)

diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
index 35edbc0..e4b7ec9 100644 (file)
--- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
+++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs
@@ -160,9 +160,27 @@ namespace System
             }
         }
 
-        private static Lazy<Version> m_icuVersion = new Lazy<Version>(GetICUVersion);
+        private static readonly Lazy<bool> m_isInvariant = new Lazy<bool>(GetIsInvariantGlobalization);
+
+        private static bool GetIsInvariantGlobalization()
+        {
+            Type globalizationMode = Type.GetType("System.Globalization.GlobalizationMode");
+            if (globalizationMode != null)
+            {
+                MethodInfo methodInfo = globalizationMode.GetProperty("Invariant", BindingFlags.NonPublic | BindingFlags.Static)?.GetMethod;
+                if (methodInfo != null)
+                {
+                    return (bool)methodInfo.Invoke(null, null);
+                }
+            }
+
+            return false;
+        }
+
+        private static readonly Lazy<Version> m_icuVersion = new Lazy<Version>(GetICUVersion);
         public static Version ICUVersion => m_icuVersion.Value;
 
+        public static bool IsInvariantGlobalization => m_isInvariant.Value;
         public static bool IsIcuGlobalization => ICUVersion > new Version(0,0,0,0);
         public static bool IsNlsGlobalization => !IsIcuGlobalization;
 

diff --git a/src/libraries/System.Collections/tests/StructuralComparisonsTests.cs b/src/libraries/System.Collections/tests/StructuralComparisonsTests.cs
index 50d3187..4318875 100644 (file)
--- a/src/libraries/System.Collections/tests/StructuralComparisonsTests.cs
+++ b/src/libraries/System.Collections/tests/StructuralComparisonsTests.cs
@@ -20,8 +20,9 @@ namespace System.Collections.Tests
             yield return new object[] { null, "abc", -1 };
             yield return new object[] { "abc", null, 1 };
             yield return new object[] { "abc", "abc", 0 };
-            yield return new object[] { "abc", "def", -1 };
-            yield return new object[] { "def", "abc", 1 };
+            // Invariant mode comparison of strings, ends up returning firstChar - secondChar when different, i.e 'd' - 'a'
+            yield return new object[] { "abc", "def", PlatformDetection.IsInvariantGlobalization ? -3 : -1 };
+            yield return new object[] { "def", "abc", PlatformDetection.IsInvariantGlobalization ? 3 : 1 };
             yield return new object[] { new StructuralObject(), "abc", 5 };
             yield return new object[] { new StructuralObject(), 123, -5 };
         }

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 66b98ce..d369aba 100644 (file)
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -29,7 +29,6 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.CodeDom\tests\System.CodeDom.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections.NonGeneric\tests\System.Collections.NonGeneric.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections.Specialized\tests\System.Collections.Specialized.Tests.csproj" />
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Annotations\tests\System.ComponentModel.Annotations.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Primitives\tests\System.ComponentModel.Primitives.Tests.csproj" />
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.TypeConverter\tests\System.ComponentModel.TypeConverter.Tests.csproj" />