From 863699ab73b4d7585bc9de84d15a1600aec1508f Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 13:26:37 -0400 Subject: [PATCH 01/13] [MacCatalyst][libraries] Add System.Console.Tests SkipOnPlatform --- src/libraries/System.Console/tests/CancelKeyPress.cs | 2 +- src/libraries/System.Console/tests/Color.cs | 6 +++--- .../System.Console/tests/ConsoleEncoding.cs | 4 ++-- src/libraries/System.Console/tests/ReadAndWrite.cs | 6 +++--- src/libraries/System.Console/tests/SetIn.cs | 4 ++-- src/libraries/System.Console/tests/SyncTextReader.cs | 2 +- src/libraries/System.Console/tests/ThreadSafety.cs | 6 +++--- src/libraries/System.Console/tests/Timeout.cs | 6 +++--- .../System.Console/tests/WindowAndCursorProps.cs | 12 ++++++------ 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/libraries/System.Console/tests/CancelKeyPress.cs b/src/libraries/System.Console/tests/CancelKeyPress.cs index 4ce7a8f3fef39b..d6385966c5e5c4 100644 --- a/src/libraries/System.Console/tests/CancelKeyPress.cs +++ b/src/libraries/System.Console/tests/CancelKeyPress.cs @@ -13,7 +13,7 @@ public partial class CancelKeyPressTests private const int WaitFailTestTimeoutSeconds = 30; [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void CanAddAndRemoveHandler() { ConsoleCancelEventHandler handler = (sender, e) => diff --git a/src/libraries/System.Console/tests/Color.cs b/src/libraries/System.Console/tests/Color.cs index 1ee9e32748dabe..567faad01ca4c4 100644 --- a/src/libraries/System.Console/tests/Color.cs +++ b/src/libraries/System.Console/tests/Color.cs @@ -12,7 +12,7 @@ public class Color { [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void InvalidColors() { AssertExtensions.Throws(null, () => Console.BackgroundColor = (ConsoleColor)42); @@ -20,7 +20,7 @@ public static void InvalidColors() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void RoundtrippingColor() { Console.BackgroundColor = Console.BackgroundColor; @@ -49,7 +49,7 @@ public static void BackgroundColor_Throws_PlatformNotSupportedException() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void RedirectedOutputDoesNotUseAnsiSequences() { // Make sure that redirecting to a memory stream causes Console not to write out the ANSI sequences diff --git a/src/libraries/System.Console/tests/ConsoleEncoding.cs b/src/libraries/System.Console/tests/ConsoleEncoding.cs index ce3bfc698501c1..484c65f11621e9 100644 --- a/src/libraries/System.Console/tests/ConsoleEncoding.cs +++ b/src/libraries/System.Console/tests/ConsoleEncoding.cs @@ -22,7 +22,7 @@ public static IEnumerable InputData() [Theory] [MemberData(nameof(InputData))] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public void TestEncoding(string inputString) { TextWriter outConsoleStream = Console.Out; @@ -79,7 +79,7 @@ public void TestEncoding(string inputString) } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public void TestValidEncodings() { Action check = encoding => diff --git a/src/libraries/System.Console/tests/ReadAndWrite.cs b/src/libraries/System.Console/tests/ReadAndWrite.cs index 29bb58dfae0b07..6fd77d6afa9918 100644 --- a/src/libraries/System.Console/tests/ReadAndWrite.cs +++ b/src/libraries/System.Console/tests/ReadAndWrite.cs @@ -258,7 +258,7 @@ private static unsafe void ValidateConsoleEncoding(Encoding encoding) } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static unsafe void OutputEncodingPreamble() { Encoding curEncoding = Console.OutputEncoding; @@ -281,7 +281,7 @@ public static unsafe void OutputEncodingPreamble() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static unsafe void OutputEncoding() { Encoding curEncoding = Console.OutputEncoding; @@ -349,7 +349,7 @@ public static void InputEncoding_Getter_Throws_PlatformNotSupportedException() }; [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void ReadAndReadLine() { TextWriter savedStandardOutput = Console.Out; diff --git a/src/libraries/System.Console/tests/SetIn.cs b/src/libraries/System.Console/tests/SetIn.cs index 111fa7bcc6aa40..4df9bdef462884 100644 --- a/src/libraries/System.Console/tests/SetIn.cs +++ b/src/libraries/System.Console/tests/SetIn.cs @@ -11,7 +11,7 @@ public class SetIn { [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void SetInThrowsOnNull() { TextReader savedIn = Console.In; @@ -26,7 +26,7 @@ public static void SetInThrowsOnNull() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void SetInReadLine() { const string TextStringFormat = "Test {0}"; diff --git a/src/libraries/System.Console/tests/SyncTextReader.cs b/src/libraries/System.Console/tests/SyncTextReader.cs index dd64326275a676..01c4a0c78de25c 100644 --- a/src/libraries/System.Console/tests/SyncTextReader.cs +++ b/src/libraries/System.Console/tests/SyncTextReader.cs @@ -6,7 +6,7 @@ using System.Text; using Xunit; -[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] +[SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public class SyncTextReader { // NOTE: These tests test the underlying SyncTextReader by diff --git a/src/libraries/System.Console/tests/ThreadSafety.cs b/src/libraries/System.Console/tests/ThreadSafety.cs index 778bb958c0a482..102aa8d730fabf 100644 --- a/src/libraries/System.Console/tests/ThreadSafety.cs +++ b/src/libraries/System.Console/tests/ThreadSafety.cs @@ -12,7 +12,7 @@ public class ThreadSafety const int NumberOfIterations = 100; [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void OpenStandardXXXCanBeCalledConcurrently() { Parallel.For(0, NumberOfIterations, i => @@ -41,7 +41,7 @@ public static void OpenStandardXXXCanBeCalledConcurrently() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void SetStandardXXXCanBeCalledConcurrently() { TextReader savedStandardInput = Console.In; @@ -84,7 +84,7 @@ public static void SetStandardXXXCanBeCalledConcurrently() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void ReadMayBeCalledConcurrently() { const char TestChar = '+'; diff --git a/src/libraries/System.Console/tests/Timeout.cs b/src/libraries/System.Console/tests/Timeout.cs index c0d128602bc05e..2b50c671c2d372 100644 --- a/src/libraries/System.Console/tests/Timeout.cs +++ b/src/libraries/System.Console/tests/Timeout.cs @@ -11,7 +11,7 @@ public class TimeOut { [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void OpenStandardXXX_WriteTimeOut() { using (Stream standardOut = Console.OpenStandardOutput(), standardIn = Console.OpenStandardInput(), standardError = Console.OpenStandardError()) @@ -27,7 +27,7 @@ public static void OpenStandardXXX_WriteTimeOut() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void OpenStandardXXX_ReadTimeOut() { using (Stream standardOut = Console.OpenStandardOutput(), standardIn = Console.OpenStandardInput(), standardError = Console.OpenStandardError()) @@ -43,7 +43,7 @@ public static void OpenStandardXXX_ReadTimeOut() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void OpenStandardXXX_CanTimeOut() { using (Stream standardOut = Console.OpenStandardOutput(), standardIn = Console.OpenStandardInput(), standardError = Console.OpenStandardError()) diff --git a/src/libraries/System.Console/tests/WindowAndCursorProps.cs b/src/libraries/System.Console/tests/WindowAndCursorProps.cs index 0e1763e84b20bc..55057d54c0b67e 100644 --- a/src/libraries/System.Console/tests/WindowAndCursorProps.cs +++ b/src/libraries/System.Console/tests/WindowAndCursorProps.cs @@ -337,7 +337,7 @@ public static void SetCursorPosition_Throws_PlatformNotSupportedException() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void SetCursorPosition_Invoke_Success() { if (!OperatingSystem.IsWindows() || (!Console.IsInputRedirected && !Console.IsOutputRedirected)) @@ -364,7 +364,7 @@ public void SetCursorPosition_InvalidPosition_ThrowsArgumentOutOfRangeException( } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public static void GetCursorPosition_Invoke_ReturnsExpected() { if (!Console.IsInputRedirected && !Console.IsOutputRedirected) @@ -391,7 +391,7 @@ public static void GetCursorPosition_Invoke_ReturnsExpected() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public void CursorLeft_Set_GetReturnsExpected() { if (!Console.IsInputRedirected && !Console.IsOutputRedirected) @@ -413,7 +413,7 @@ public void CursorLeft_Set_GetReturnsExpected() [Theory] [InlineData(-1)] [InlineData(short.MaxValue + 1)] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public void CursorLeft_SetInvalid_ThrowsArgumentOutOfRangeException(int value) { if (PlatformDetection.IsWindows && Console.IsOutputRedirected) @@ -434,7 +434,7 @@ public void CursorLeft_Setter_Throws_PlatformNotSupportedException() } [Fact] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public void CursorTop_Set_GetReturnsExpected() { if (!Console.IsInputRedirected && !Console.IsOutputRedirected) @@ -456,7 +456,7 @@ public void CursorTop_Set_GetReturnsExpected() [Theory] [InlineData(-1)] [InlineData(short.MaxValue + 1)] - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] public void CursorTop_SetInvalid_ThrowsArgumentOutOfRangeException(int value) { if (PlatformDetection.IsWindows & Console.IsOutputRedirected) From 9871fe4a6e65b10d52f303f5d00d154b375199d3 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 13:43:30 -0400 Subject: [PATCH 02/13] [MacCatalyst][libraries] Add System.Diagnostics.Process.Tests SkipOnPlatform --- .../System.Diagnostics.Process/tests/ProcessTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs index 7858d428649f18..53002a700b0e04 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs @@ -548,7 +548,7 @@ public void TestMaxWorkingSet() } [Fact] - [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD | TestPlatforms.iOS | TestPlatforms.tvOS, "Getting MaxWorkingSet is not supported on OSX, BSD, iOS, and tvOS.")] + [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Getting MaxWorkingSet is not supported on OSX, BSD, iOS, MacCatalyst, and tvOS.")] public void MaxWorkingSet_GetNotStarted_ThrowsInvalidOperationException() { var process = new Process(); @@ -603,7 +603,7 @@ public void TestMinWorkingSet() } [Fact] - [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD | TestPlatforms.iOS | TestPlatforms.tvOS, "Getting MinWorkingSet is not supported on OSX, BSD, iOS, and tvOS.")] + [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Getting MinWorkingSet is not supported on OSX, BSD, iOS, MacCatalyst, and tvOS.")] public void MinWorkingSet_GetNotStarted_ThrowsInvalidOperationException() { var process = new Process(); From aa482fc0b3514ffd2a3efc1340ccd3101a3c1b43 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 13:43:56 -0400 Subject: [PATCH 03/13] [MacCatalyst][libraries] Add Microsoft.Extensions.Hosting.Unit.Tests SkipOnPlatform --- .../Microsoft.Extensions.Hosting/tests/UnitTests/HostTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostTests.cs b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostTests.cs index fe0a4145fe3d27..345fcbb7866507 100644 --- a/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostTests.cs +++ b/src/libraries/Microsoft.Extensions.Hosting/tests/UnitTests/HostTests.cs @@ -21,7 +21,7 @@ namespace Microsoft.Extensions.Hosting.Tests public partial class HostTests { [Fact] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS or tvOS.")] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public async Task StopAsyncWithCancellation() { var builder = new HostBuilder(); From 6c58373b673bdef9aca31af674e28c2850d20172 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 13:44:22 -0400 Subject: [PATCH 04/13] [MacCatalyst][libraries] Add System.Net.NetworkInformation.FunctionalTests SkipOnPlatform --- .../tests/FunctionalTests/NetworkInterfaceBasicTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs index 2ce80187032907..7554f679deccd9 100644 --- a/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs +++ b/src/libraries/System.Net.NetworkInformation/tests/FunctionalTests/NetworkInterfaceBasicTest.cs @@ -282,7 +282,7 @@ public void BasicTest_GetIsNetworkAvailable_Success() [Theory] [ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD, "Expected behavior is different on OSX or FreeBSD")] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] [InlineData(false)] [InlineData(true)] [ActiveIssue("https://github.com/dotnet/runtime/issues/50567", TestPlatforms.Android)] From bff22a3c3bf295d53aa495538e8aa990f326ddf9 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 13:44:37 -0400 Subject: [PATCH 05/13] [MacCatalyst][libraries] Add System.IO.FileSystems.Tests SkipOnPlatform --- .../System.IO.FileSystem/tests/FileStream/LockUnlock.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.IO.FileSystem/tests/FileStream/LockUnlock.cs b/src/libraries/System.IO.FileSystem/tests/FileStream/LockUnlock.cs index bdd41d2c4e6288..8037cac502ed4e 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileStream/LockUnlock.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileStream/LockUnlock.cs @@ -58,7 +58,7 @@ public void LockUnlock_Unsupported_OSX() [InlineData(200, 50, 150)] [InlineData(200, 100, 100)] [InlineData(20, 2000, 1000)] - [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on macOS/iOS/tvOS/MacCatalyst.")] + [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on macOS/iOS/tvOS/MacCatalyst.")] public void Lock_Unlock_Successful(long fileLength, long position, long length) { string path = GetTestFilePath(); @@ -75,7 +75,7 @@ public void Lock_Unlock_Successful(long fileLength, long position, long length) [InlineData(FileAccess.Read)] [InlineData(FileAccess.Write)] [InlineData(FileAccess.ReadWrite)] - [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on macOS/iOS/tvOS/MacCatalyst.")] + [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on macOS/iOS/tvOS/MacCatalyst.")] public void Lock_Unlock_Successful_AlternateFileAccess(FileAccess fileAccess) { string path = GetTestFilePath(); @@ -89,7 +89,7 @@ public void Lock_Unlock_Successful_AlternateFileAccess(FileAccess fileAccess) [Theory] [InlineData(10, 0, 2, 3, 5)] - [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on macOS/iOS/tvOS/MacCatalyst.")] + [SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on macOS/iOS/tvOS/MacCatalyst.")] public void NonOverlappingRegions_Success(long fileLength, long firstPosition, long firstLength, long secondPosition, long secondLength) { string path = GetTestFilePath(); From 8e75ea48b45a16e8f394027ebafd5b07151ccf7c Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 13:58:31 -0400 Subject: [PATCH 06/13] [MacCatalyst][libraries] Add Microsoft.VisualBasic.Core.Tests ActiveIssue --- .../Microsoft.VisualBasic.Core/tests/FileSystemTests.cs | 2 ++ .../tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/FileSystemTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/FileSystemTests.cs index 71bc7185b3d48d..b3428a838ace4d 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/FileSystemTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/FileSystemTests.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) // path that followed the symlink. [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotOSX))] [ActiveIssue("https://github.com/dotnet/runtime/issues/50572", TestPlatforms.Android)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52851", TestPlatforms.MacCatalyst)] public void ChDir() { var savedDirectory = System.IO.Directory.GetCurrentDirectory(); @@ -86,6 +87,7 @@ static string getString(string fileName) // Can't get current directory on OSX before setting it. [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotOSX))] [ActiveIssue("https://github.com/dotnet/runtime/issues/50572", TestPlatforms.Android)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52851", TestPlatforms.MacCatalyst)] public void CurDir() { Assert.Equal(FileSystem.CurDir(), System.IO.Directory.GetCurrentDirectory()); diff --git a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs index 6c8ee593729cf2..a2f8632f98f395 100644 --- a/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs +++ b/src/libraries/Microsoft.VisualBasic.Core/tests/Microsoft/VisualBasic/FileIO/FileSystemTests.cs @@ -298,6 +298,7 @@ public void CurrentDirectoryGet() // path that followed the symlink. [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotOSX))] [ActiveIssue("https://github.com/dotnet/runtime/issues/50572", TestPlatforms.Android)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52851", TestPlatforms.MacCatalyst)] public void CurrentDirectorySet() { var SavedCurrentDirectory = System.IO.Directory.GetCurrentDirectory(); From 64d012a2cc5cfd49fbe49b2370dc8509f639bc70 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 13:58:50 -0400 Subject: [PATCH 07/13] [MacCatalyst][libraries] Add System.Diagnostics.Process.Tests ActiveIssue --- .../System.Diagnostics.Process/tests/ProcessTests.Unix.cs | 1 + src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs index 2ce95e3408a9c2..d79f86486c4fb8 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs @@ -159,6 +159,7 @@ public void ProcessStart_UseShellExecute_OnUnix_SuccessWhenProgramInstalled(bool [Fact] [SkipOnPlatform(TestPlatforms.OSX, "On OSX, ProcessName returns the script interpreter.")] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52852", TestPlatforms.MacCatalyst)] public void ProcessNameMatchesScriptName() { string scriptName = GetTestFileName(); diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs index 53002a700b0e04..56df0c4022d572 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs @@ -277,6 +277,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder) [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [InlineData(true), InlineData(false)] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52852", TestPlatforms.MacCatalyst)] public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl) { string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42); @@ -346,6 +347,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder() nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsIoTCore))] [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52852", TestPlatforms.MacCatalyst)] public void ProcessStart_UseShellExecute_WorkingDirectory() { // Create a directory that will ProcessStartInfo.WorkingDirectory @@ -2094,6 +2096,7 @@ public void TestLongProcessIsWorking() [PlatformSpecific(TestPlatforms.AnyUnix)] [ActiveIssue("https://github.com/dotnet/runtime/issues/29330", TestPlatforms.OSX)] [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52852", TestPlatforms.MacCatalyst)] public void LongProcessNamesAreSupported() { string sleepPath; From c863805a541e1985b611e0fbb8ee6ec86857c7bc Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 14:24:17 -0400 Subject: [PATCH 08/13] [MacCatalyst][libraries] Add System.Threading.Thread.Tests ActiveIssue --- src/libraries/System.Threading.Thread/tests/ThreadTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Threading.Thread/tests/ThreadTests.cs b/src/libraries/System.Threading.Thread/tests/ThreadTests.cs index e89935d78777dd..06e09986acd94b 100644 --- a/src/libraries/System.Threading.Thread/tests/ThreadTests.cs +++ b/src/libraries/System.Threading.Thread/tests/ThreadTests.cs @@ -172,6 +172,7 @@ public static IEnumerable ApartmentStateTest_MemberData() [ActiveIssue("https://github.com/dotnet/runtime/issues/49568", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))] [ActiveIssue("https://github.com/dotnet/runtime/issues/50577", TestPlatforms.Android)] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS or tvOS.")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52856", TestPlatforms.MacCatalyst)] public static void ApartmentState_AttributePresent(string appName, string testName) { var psi = new ProcessStartInfo(); From 6fb59b7600cc7d92ae3469f98adb2462223af8e0 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 14:24:51 -0400 Subject: [PATCH 09/13] [MacCatalyst][libraries] Add System.IO.FileSystem.Tests ActiveIssue --- src/libraries/System.IO.FileSystem/tests/Directory/Exists.cs | 1 + .../System.IO.FileSystem/tests/DirectoryInfo/Exists.cs | 1 + src/libraries/System.IO.FileSystem/tests/File/Exists.cs | 3 ++- src/libraries/System.IO.FileSystem/tests/FileInfo/Exists.cs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/Exists.cs b/src/libraries/System.IO.FileSystem/tests/Directory/Exists.cs index 107472c795059b..c814f88fe9b92c 100644 --- a/src/libraries/System.IO.FileSystem/tests/Directory/Exists.cs +++ b/src/libraries/System.IO.FileSystem/tests/Directory/Exists.cs @@ -236,6 +236,7 @@ public void DoesCaseInsensitiveInvariantComparisons() [Fact] [PlatformSpecific(CaseSensitivePlatforms)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52857", TestPlatforms.MacCatalyst)] public void DoesCaseSensitiveComparisons() { DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); diff --git a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs index 1be25240b0d6a3..f573ab57dacba0 100644 --- a/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs +++ b/src/libraries/System.IO.FileSystem/tests/DirectoryInfo/Exists.cs @@ -77,6 +77,7 @@ public void CaseInsensitivity() [Fact] [PlatformSpecific(CaseSensitivePlatforms)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52857", TestPlatforms.MacCatalyst)] public void CaseSensitivity() { Assert.False(new DirectoryInfo(TestDirectory.ToUpperInvariant()).Exists); diff --git a/src/libraries/System.IO.FileSystem/tests/File/Exists.cs b/src/libraries/System.IO.FileSystem/tests/File/Exists.cs index b37c8d94c32f3b..f5513ce406ef9d 100644 --- a/src/libraries/System.IO.FileSystem/tests/File/Exists.cs +++ b/src/libraries/System.IO.FileSystem/tests/File/Exists.cs @@ -180,7 +180,8 @@ public void DoesCaseInsensitiveInvariantComparions() [Fact] [PlatformSpecific(CaseSensitivePlatforms)] - public void DoesCaseSensitiveComparions() + [ActiveIssue("https://github.com/dotnet/runtime/issues/52857", TestPlatforms.MacCatalyst)] + public void DoesCaseSensitiveComparisons() { FileInfo testFile = new FileInfo(GetTestFilePath()); testFile.Create().Dispose(); diff --git a/src/libraries/System.IO.FileSystem/tests/FileInfo/Exists.cs b/src/libraries/System.IO.FileSystem/tests/FileInfo/Exists.cs index 72b8ba48ba3ab2..fefe9a0209d926 100644 --- a/src/libraries/System.IO.FileSystem/tests/FileInfo/Exists.cs +++ b/src/libraries/System.IO.FileSystem/tests/FileInfo/Exists.cs @@ -63,6 +63,7 @@ public void CaseInsensitivity() [Fact] [PlatformSpecific(CaseSensitivePlatforms)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52857", TestPlatforms.MacCatalyst)] public void CaseSensitivity() { string path = GetTestFilePath(); From aedde8d00837c91a6816b18495a3d973b5f82e84 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 14:25:08 -0400 Subject: [PATCH 10/13] [MacCatalyst][libraries] Add System.Runtime.Extensions.Tests ActiveIssue --- .../System.Runtime.Extensions/tests/System/Environment.Exit.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs b/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs index 0ad14d628fc745..80626709251f12 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs @@ -45,6 +45,7 @@ public static void ExitCode_Roundtrips(int exitCode) [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] [ActiveIssue("https://github.com/dotnet/runtime/issues/49568", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))] [ActiveIssue("https://github.com/dotnet/runtime/issues/49868", TestPlatforms.Android)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52858", TestPlatforms.MacCatalyst)] public static void ExitCode_VoidMainAppReturnsSetValue(int mode) { int expectedExitCode = 123; From f684019faab8dfee9df5c9187e948ca74d197f98 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 14:27:19 -0400 Subject: [PATCH 11/13] [MacCatalyst][libraries] Remove test project level skips --- src/libraries/tests.proj | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 5530af517ee69f..8900f329ad582d 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -184,16 +184,6 @@ - - - - - - - - - - From 671cfb339de746e9a26f14f359a4496f98d7c3f7 Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 17 May 2021 22:20:36 -0400 Subject: [PATCH 12/13] [MacCatalyst] Add forgotten PNSE and ActiveIssue --- .../System.Console/tests/WindowAndCursorProps.cs | 16 ++++++++-------- .../tests/ProcessTests.Unix.cs | 2 ++ .../tests/ProcessTests.cs | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/libraries/System.Console/tests/WindowAndCursorProps.cs b/src/libraries/System.Console/tests/WindowAndCursorProps.cs index 55057d54c0b67e..f5ddc739def316 100644 --- a/src/libraries/System.Console/tests/WindowAndCursorProps.cs +++ b/src/libraries/System.Console/tests/WindowAndCursorProps.cs @@ -11,7 +11,7 @@ public class WindowAndCursorProps { [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix public static void BufferWidth_GetUnix_ReturnsWindowWidth() { Assert.Equal(Console.WindowWidth, Console.BufferWidth); @@ -25,7 +25,7 @@ public static void BufferWidth_SetUnix_ThrowsPlatformNotSupportedException() } [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix public static void BufferHeight_GetUnix_ReturnsWindowHeight() { Assert.Equal(Console.WindowHeight, Console.BufferHeight); @@ -62,7 +62,7 @@ public static void WindowWidth_SetInvalid_ThrowsArgumentOutOfRangeException(int } [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix public static void WindowWidth_GetUnix_Success() { // Validate that Console.WindowWidth returns some value in a non-redirected o/p. @@ -94,7 +94,7 @@ public static void WindowHeight_SetInvalid_ThrowsArgumentOutOfRangeException(int } [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix public static void WindowHeight_GetUnix_Success() { // Validate that Console.WindowHeight returns some value in a non-redirected o/p. @@ -110,7 +110,7 @@ public static void WindowHeight_SetUnix_ThrowsPlatformNotSupportedException() } [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix public static void LargestWindowWidth_UnixGet_ReturnsExpected() { Helpers.RunInNonRedirectedOutput((data) => Assert.Equal(Console.WindowWidth, Console.LargestWindowWidth)); @@ -118,7 +118,7 @@ public static void LargestWindowWidth_UnixGet_ReturnsExpected() } [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix public static void LargestWindowHeight_UnixGet_ReturnsExpected() { Helpers.RunInNonRedirectedOutput((data) => Assert.Equal(Console.WindowHeight, Console.LargestWindowHeight)); @@ -191,7 +191,7 @@ public static void CursorVisible_GetUnix_ThrowsPlatformNotSupportedException() } [Theory] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] // Expected behavior specific to Unix + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS )] // Expected behavior specific to Unix [InlineData(true)] [InlineData(false)] public static void CursorVisible_SetUnixRedirected_Nop(bool value) @@ -505,7 +505,7 @@ public void CursorSize_SetInvalidValue_ThrowsArgumentOutOfRangeException(int val } [Fact] - [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.tvOS)] + [PlatformSpecific(TestPlatforms.AnyUnix & ~TestPlatforms.Browser & ~TestPlatforms.iOS & ~TestPlatforms.MacCatalyst & ~TestPlatforms.tvOS)] public void CursorSize_GetUnix_ReturnsExpected() { Assert.Equal(100, Console.CursorSize); diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs index d79f86486c4fb8..5ac91d07e321b6 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs @@ -479,6 +479,7 @@ public void TestBasePriorityOnUnix() [Fact] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52882", TestPlatforms.MacCatalyst)] public void TestStartOnUnixWithBadPermissions() { string path = GetTestFilePath(); @@ -491,6 +492,7 @@ public void TestStartOnUnixWithBadPermissions() [Fact] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52882", TestPlatforms.MacCatalyst)] public void TestStartOnUnixWithBadFormat() { string path = GetTestFilePath(); diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs index 56df0c4022d572..31efe45c3f6575 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs @@ -194,6 +194,7 @@ public void ProcessStart_TryOpenFolder_UseShellExecuteIsFalse_ThrowsWin32Excepti [Fact] [SkipOnPlatform(TestPlatforms.OSX, "OSX doesn't support throwing on Process.Start")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52882", TestPlatforms.MacCatalyst)] public void TestStartWithBadWorkingDirectory() { string program; @@ -1384,6 +1385,7 @@ public void CanBeFinalized() [InlineData(false)] [InlineData(true)] [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] + [ActiveIssue("https://github.com/dotnet/runtime/issues/52882", TestPlatforms.MacCatalyst)] public void TestStartWithMissingFile(bool fullPath) { string path = Guid.NewGuid().ToString("N"); From cd95e8a76177095aa529b938ad5e83079b67082e Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Tue, 18 May 2021 14:53:29 -0400 Subject: [PATCH 13/13] [MacCatalyst][libraries] Coalesce MacCatalyst into iOS tvOS SkipOnPlatform --- .../tests/ProcessTests.Unix.cs | 9 +++------ .../System.Diagnostics.Process/tests/ProcessTests.cs | 9 +++------ .../tests/System/Environment.Exit.cs | 3 +-- .../System.Threading.Thread/tests/ThreadTests.cs | 3 +-- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs index 5ac91d07e321b6..fe3c26b1e8592c 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.Unix.cs @@ -158,8 +158,7 @@ public void ProcessStart_UseShellExecute_OnUnix_SuccessWhenProgramInstalled(bool [Fact] [SkipOnPlatform(TestPlatforms.OSX, "On OSX, ProcessName returns the script interpreter.")] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52852", TestPlatforms.MacCatalyst)] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public void ProcessNameMatchesScriptName() { string scriptName = GetTestFileName(); @@ -478,8 +477,7 @@ public void TestBasePriorityOnUnix() } [Fact] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52882", TestPlatforms.MacCatalyst)] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public void TestStartOnUnixWithBadPermissions() { string path = GetTestFilePath(); @@ -491,8 +489,7 @@ public void TestStartOnUnixWithBadPermissions() } [Fact] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52882", TestPlatforms.MacCatalyst)] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public void TestStartOnUnixWithBadFormat() { string path = GetTestFilePath(); diff --git a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs index 31efe45c3f6575..a283934443794d 100644 --- a/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs +++ b/src/libraries/System.Diagnostics.Process/tests/ProcessTests.cs @@ -277,8 +277,7 @@ public void ProcessStart_UseShellExecute_OnWindows_DoesNotThrow(bool isFolder) nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsIoTCore))] [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] [InlineData(true), InlineData(false)] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52852", TestPlatforms.MacCatalyst)] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public void ProcessStart_UseShellExecute_Executes(bool filenameAsUrl) { string filename = WriteScriptFile(TestDirectory, GetTestFileName(), returnValue: 42); @@ -347,8 +346,7 @@ public void ProcessStart_UseShellExecute_ExecuteOrder() [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsServerCore), nameof(PlatformDetection.IsNotWindowsNanoServer), nameof(PlatformDetection.IsNotWindowsIoTCore))] [ActiveIssue("https://github.com/dotnet/runtime/issues/34685", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52852", TestPlatforms.MacCatalyst)] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public void ProcessStart_UseShellExecute_WorkingDirectory() { // Create a directory that will ProcessStartInfo.WorkingDirectory @@ -1384,8 +1382,7 @@ public void CanBeFinalized() [Theory] [InlineData(false)] [InlineData(true)] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS, or tvOS.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52882", TestPlatforms.MacCatalyst)] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public void TestStartWithMissingFile(bool fullPath) { string path = Guid.NewGuid().ToString("N"); diff --git a/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs b/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs index 80626709251f12..626aa3ac8ee057 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/Environment.Exit.cs @@ -42,10 +42,9 @@ public static void ExitCode_Roundtrips(int exitCode) [InlineData(1)] // setting ExitCode and exiting Main [InlineData(2)] // setting ExitCode both from Main and from an Unloading event handler. [InlineData(3)] // using Exit(exitCode) - [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on Browser, iOS, or tvOS.")] + [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on Browser, iOS, MacCatalyst, or tvOS.")] [ActiveIssue("https://github.com/dotnet/runtime/issues/49568", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))] [ActiveIssue("https://github.com/dotnet/runtime/issues/49868", TestPlatforms.Android)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52858", TestPlatforms.MacCatalyst)] public static void ExitCode_VoidMainAppReturnsSetValue(int mode) { int expectedExitCode = 123; diff --git a/src/libraries/System.Threading.Thread/tests/ThreadTests.cs b/src/libraries/System.Threading.Thread/tests/ThreadTests.cs index 06e09986acd94b..acfd85eebc9c02 100644 --- a/src/libraries/System.Threading.Thread/tests/ThreadTests.cs +++ b/src/libraries/System.Threading.Thread/tests/ThreadTests.cs @@ -171,8 +171,7 @@ public static IEnumerable ApartmentStateTest_MemberData() [InlineData("DefaultApartmentStateMain.exe", "SetApartmentStateTest")] [ActiveIssue("https://github.com/dotnet/runtime/issues/49568", typeof(PlatformDetection), nameof(PlatformDetection.IsMacOsAppleSilicon))] [ActiveIssue("https://github.com/dotnet/runtime/issues/50577", TestPlatforms.Android)] - [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "Not supported on iOS or tvOS.")] - [ActiveIssue("https://github.com/dotnet/runtime/issues/52856", TestPlatforms.MacCatalyst)] + [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "Not supported on iOS, MacCatalyst, or tvOS.")] public static void ApartmentState_AttributePresent(string appName, string testName) { var psi = new ProcessStartInfo();