Reenable a few OperatingSystem tests on MacCatalyst (dotnet#58428)

dotnet#56084 was fixed.
mdh1418 · Sep 2, 2021 · 2d3ad72 · 2d3ad72
1 parent 6f68bbd
commit 2d3ad72
Showing 1 changed file with 33 additions and 8 deletions.
diff --git a/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs
@@ -102,11 +102,9 @@ public static void IsOSPlatformVersionAtLeast_InvalidArgs_Throws()
         public static void TestIsOSVersionAtLeast_Android_21() => Assert.True(OperatingSystem.IsAndroidVersionAtLeast(21)); // 21 is our min supported version
 
         [Fact, PlatformSpecific(TestPlatforms.iOS)]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/56084", TestPlatforms.MacCatalyst)]
         public static void TestIsOSPlatform_IOS() => TestIsOSPlatform("iOS", OperatingSystem.IsIOS);
 
         [Fact, PlatformSpecific(TestPlatforms.iOS)]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/56084", TestPlatforms.MacCatalyst)]
         public static void TestIsOSVersionAtLeast_IOS() => TestIsOSVersionAtLeast("iOS");
 
         [Fact, PlatformSpecific(TestPlatforms.OSX)]
@@ -129,11 +127,9 @@ public static void OSX_Is_Treated_as_macOS()
         }
 
         [Fact, PlatformSpecific(TestPlatforms.MacCatalyst)]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/56084", TestPlatforms.MacCatalyst)]
         public static void TestIsOSPlatform_MacCatalyst() => TestIsOSPlatform("MacCatalyst", OperatingSystem.IsMacCatalyst);
 
         [Fact, PlatformSpecific(TestPlatforms.MacCatalyst)]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/56084", TestPlatforms.MacCatalyst)]
         public static void TestIsOSVersionAtLeast_MacCatalyst() => TestIsOSVersionAtLeast("MacCatalyst");
 
         [Fact, PlatformSpecific(TestPlatforms.MacCatalyst)]
@@ -147,7 +143,6 @@ public static void MacCatalyst_Is_Also_iOS()
         }
 
         [Fact, PlatformSpecific(TestPlatforms.iOS)]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/56084", TestPlatforms.MacCatalyst)]
         public static void IOS_Is_Not_Also_MacCatalyst()
         {
             Assert.False(OperatingSystem.IsOSPlatform("MacCatalyst"));
@@ -172,6 +167,12 @@ private static void TestIsOSPlatform(string currentOSName, Func<bool> currentOSC
             {
                 bool expected = currentOSName.Equals(platformName, StringComparison.OrdinalIgnoreCase);
 
+                // MacCatalyst is a special case since it also returns true for iOS
+                if (currentOSName == "MacCatalyst" && platformName == "iOS")
+                {
+                    expected = true;
+                }
+
                 Assert.Equal(expected, OperatingSystem.IsOSPlatform(platformName));
                 Assert.Equal(expected, OperatingSystem.IsOSPlatform(platformName.ToUpper()));
                 Assert.Equal(expected, OperatingSystem.IsOSPlatform(platformName.ToLower()));
@@ -186,14 +187,32 @@ private static void TestIsOSPlatform(string currentOSName, Func<bool> currentOSC
                 OperatingSystem.IsFreeBSD(),
                 OperatingSystem.IsAndroid(),
                 OperatingSystem.IsIOS(),
-                OperatingSystem.IsMacOS(),
                 OperatingSystem.IsMacCatalyst(),
+                OperatingSystem.IsMacOS(),
                 OperatingSystem.IsTvOS(),
                 OperatingSystem.IsWatchOS(),
                 OperatingSystem.IsWindows()
             };
 
-            Assert.Single(allResults, true);
+            // MacCatalyst is a special case since it also returns true for iOS
+            if (currentOSName == "MacCatalyst")
+            {
+                Assert.Equal(10, allResults.Length);
+                Assert.False(allResults[0]); // IsBrowser()
+                Assert.False(allResults[1]); // IsLinux()
+                Assert.False(allResults[2]); // IsFreeBSD()
+                Assert.False(allResults[3]); // IsAndroid()
+                Assert.True(allResults[4]);  // IsIOS()
+                Assert.True(allResults[5]);  // IsMacCatalyst()
+                Assert.False(allResults[6]); // IsMacOS()
+                Assert.False(allResults[7]); // IsTvOS()
+                Assert.False(allResults[8]); // IsWatchOS()
+                Assert.False(allResults[9]); // IsWindows()
+            }
+            else
+            {
+                Assert.Single(allResults, true);
+            }
         }
 
         private static void TestIsOSVersionAtLeast(string currentOSName)
@@ -202,13 +221,19 @@ private static void TestIsOSVersionAtLeast(string currentOSName)
             {
                 bool isCurrentOS = currentOSName.Equals(platformName, StringComparison.OrdinalIgnoreCase);
 
+                // MacCatalyst is a special case since it also returns true for iOS
+                if (currentOSName == "MacCatalyst" && platformName == "iOS")
+                {
+                    isCurrentOS = true;
+                }
+
                 AssertVersionChecks(isCurrentOS, (major, minor, build, revision) => OperatingSystem.IsOSPlatformVersionAtLeast(platformName, major, minor, build, revision));
                 AssertVersionChecks(isCurrentOS, (major, minor, build, revision) => OperatingSystem.IsOSPlatformVersionAtLeast(platformName.ToLower(), major, minor, build, revision));
                 AssertVersionChecks(isCurrentOS, (major, minor, build, revision) => OperatingSystem.IsOSPlatformVersionAtLeast(platformName.ToUpper(), major, minor, build, revision));
             }
 
             AssertVersionChecks(currentOSName.Equals("Android", StringComparison.OrdinalIgnoreCase), OperatingSystem.IsAndroidVersionAtLeast);
-            AssertVersionChecks(currentOSName.Equals("iOS", StringComparison.OrdinalIgnoreCase), OperatingSystem.IsIOSVersionAtLeast);
+            AssertVersionChecks(currentOSName == "MacCatalyst" || currentOSName.Equals("iOS", StringComparison.OrdinalIgnoreCase), OperatingSystem.IsIOSVersionAtLeast);
             AssertVersionChecks(currentOSName.Equals("macOS", StringComparison.OrdinalIgnoreCase), OperatingSystem.IsMacOSVersionAtLeast);
             AssertVersionChecks(currentOSName.Equals("MacCatalyst", StringComparison.OrdinalIgnoreCase), OperatingSystem.IsMacCatalystVersionAtLeast);
             AssertVersionChecks(currentOSName.Equals("tvOS", StringComparison.OrdinalIgnoreCase), OperatingSystem.IsTvOSVersionAtLeast);