diff --git a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/ActivityTracking.cs b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/ActivityTracking.cs index 1330901b00bff7..409efbedd73bb2 100644 --- a/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/ActivityTracking.cs +++ b/src/libraries/System.Diagnostics.Tracing/tests/BasicEventSourceTest/ActivityTracking.cs @@ -14,6 +14,7 @@ namespace BasicEventSourceTests public class ActivityTracking { [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/56073", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)] public void StartStopCreatesActivity() { using ActivityEventListener l = new ActivityEventListener(); @@ -27,6 +28,7 @@ public void StartStopCreatesActivity() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/56073", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)] public async Task ActivityFlowsAsync() { using ActivityEventListener l = new ActivityEventListener(); @@ -75,6 +77,7 @@ private async Task YieldTwoActivitiesDeep(ActivityEventSource es) // the future we might decide it wasn't even desirable to begin with. // Compare with SetCurrentActivityIdAfterEventDoesNotFlowAsync below. [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/56073", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)] public async Task SetCurrentActivityIdBeforeEventFlowsAsync() { using ActivityEventListener l = new ActivityEventListener(); @@ -100,6 +103,7 @@ public async Task SetCurrentActivityIdBeforeEventFlowsAsync() // the future we might decide it wasn't even desirable to begin with. // Compare with SetCurrentActivityIdBeforeEventFlowsAsync above. [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))] + [ActiveIssue("https://github.com/dotnet/runtime/issues/56073", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)] public async Task SetCurrentActivityIdAfterEventDoesNotFlowAsync() { using ActivityEventListener l = new ActivityEventListener(); diff --git a/src/libraries/System.Drawing.Common/tests/BrushTests.cs b/src/libraries/System.Drawing.Common/tests/BrushTests.cs index 3060b851061822..5cf621afa229ba 100644 --- a/src/libraries/System.Drawing.Common/tests/BrushTests.cs +++ b/src/libraries/System.Drawing.Common/tests/BrushTests.cs @@ -7,7 +7,7 @@ namespace System.Drawing.Tests { public class BrushTests { - [Fact] + [ConditionalFact(Helpers.IsDrawingSupported)] public void SetNativeBrush_Brush_Success() { using (var brush = new SubBrush()) diff --git a/src/libraries/System.Drawing.Common/tests/Drawing2D/HatchBrushTests.cs b/src/libraries/System.Drawing.Common/tests/Drawing2D/HatchBrushTests.cs index 8ed7826c2fb7ea..09aeae84fe2cd7 100644 --- a/src/libraries/System.Drawing.Common/tests/Drawing2D/HatchBrushTests.cs +++ b/src/libraries/System.Drawing.Common/tests/Drawing2D/HatchBrushTests.cs @@ -51,7 +51,7 @@ public void Ctor_HatchStyle_ForeColor_BackColor(HatchStyle hatchStyle, Color for } } - [Theory] + [ConditionalTheory(Helpers.IsDrawingSupported)] [InlineData(HatchStyle.Horizontal -1 )] [InlineData(HatchStyle.SolidDiamond + 1)] public void Ctor_InvalidHatchStyle_ThrowsArgumentException(HatchStyle hatchStyle) diff --git a/src/libraries/System.Drawing.Common/tests/ImageTests.cs b/src/libraries/System.Drawing.Common/tests/ImageTests.cs index 08cce1156a2e8f..5357e9a48b3709 100644 --- a/src/libraries/System.Drawing.Common/tests/ImageTests.cs +++ b/src/libraries/System.Drawing.Common/tests/ImageTests.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Collections.Generic; using System.Drawing.Imaging; using System.IO; @@ -13,6 +14,7 @@ namespace System.Drawing.Tests { + [ConditionalClass(typeof(PlatformDetection),nameof(PlatformDetection.IsDrawingSupported))] public class ImageTests { private const int PropertyTagLuminanceTable = 0x5090; @@ -22,7 +24,7 @@ public class ImageTests private const int PropertyTagTypeShort = 3; [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] public void PropertyIdList_GetBitmapJpg_Success() { using var bitmap = new Bitmap(Helpers.GetTestBitmapPath("nature24bits.jpg")); @@ -30,7 +32,7 @@ public void PropertyIdList_GetBitmapJpg_Success() Assert.NotSame(bitmap.PropertyIdList, bitmap.PropertyIdList); } - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Returns new int[0] in .NET Framework.")] public void PropertyIdList_GetEmptyMemoryBitmap_ReturnsExpected() { @@ -40,7 +42,7 @@ public void PropertyIdList_GetEmptyMemoryBitmap_ReturnsExpected() } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] public void PropertyItems_GetBitmapJpg_Success() { using var bitmap = new Bitmap(Helpers.GetTestBitmapPath("nature24bits.jpg")); @@ -82,7 +84,7 @@ public void PropertyItems_GetBitmapJpg_Success() Assert.NotSame(items, bitmap.PropertyItems); } - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Returns new PropertyItem[0] in .NET Framework.")] public void PropertyItems_GetEmptyBitmapBmp_Success() { @@ -91,7 +93,7 @@ public void PropertyItems_GetEmptyBitmapBmp_Success() Assert.Same(bitmap.PropertyItems, bitmap.PropertyItems); } - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Returns new PropertyItem[0] in .NET Framework.")] public void PropertyItems_GetEmptyMemoryBitmap_ReturnsExpected() { @@ -101,7 +103,7 @@ public void PropertyItems_GetEmptyMemoryBitmap_ReturnsExpected() } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] public void GetPropertyItem_InvokeExistsBitmapBmp_Success() { using var bitmap = new Bitmap(Helpers.GetTestBitmapPath("nature24bits.jpg")); @@ -112,7 +114,7 @@ public void GetPropertyItem_InvokeExistsBitmapBmp_Success() Assert.Equal("LEAD Technologies Inc. V1.01\0", Encoding.ASCII.GetString(item.Value)); } - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -122,7 +124,7 @@ public void GetPropertyItem_NoSuchPropertyItemEmptyMemoryBitmap_ThrowsArgumentEx Assert.Throws(null, () => bitmap.GetPropertyItem(propid)); } - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -133,7 +135,7 @@ public void GetPropertyItem_NoSuchPropertyItemEmptyImageBitmapBmp_ThrowsArgument } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] public void RemovePropertyItem_InvokeMemoryBitmap_Success() { using var source = new Bitmap(Helpers.GetTestBitmapPath("nature24bits.jpg")); @@ -162,7 +164,7 @@ public void RemovePropertyItem_InvokeMemoryBitmap_Success() } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] public void RemovePropertyItem_InvokeBitmapJpg_Success() { using var bitmap = new Bitmap(Helpers.GetTestBitmapPath("nature24bits.jpg")); @@ -183,7 +185,7 @@ public void RemovePropertyItem_InvokeBitmapJpg_Success() } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -194,7 +196,7 @@ public void RemovePropertyItem_NoSuchPropertyItemEmptyMemoryBitmap_ThrowsExterna } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -205,7 +207,7 @@ public void RemovePropertyItem_NoSuchPropertyItemEmptyImageBitmapBmp_ThrowsExter } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -224,7 +226,7 @@ public void RemovePropertyItem_NoSuchPropertyNotEmptyMemoryBitmap_ThrowsArgument } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -235,7 +237,7 @@ public void RemovePropertyItem_NoSuchPropertyNotEmptyBitmapJpg_ThrowsArgumentExc } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -295,7 +297,7 @@ public void SetPropertyItem_InvokeMemoryBitmap_Success(int propid) } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -438,7 +440,7 @@ public void SetPropertyItem_InvokeBitmapJpg_Success(int propid) } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [InlineData(0)] [InlineData(1)] [InlineData(-1)] @@ -508,7 +510,7 @@ public static IEnumerable InvalidBytes_TestData() } [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [MemberData(nameof(InvalidBytes_TestData))] public void FromFile_InvalidBytes_ThrowsOutOfMemoryException(byte[] bytes) { @@ -564,7 +566,7 @@ public void FromFile_NoSuchFile_ThrowsFileNotFoundException() [ActiveIssue("https://github.com/dotnet/runtime/issues/22221", TestPlatforms.AnyUnix)] [ActiveIssue("https://github.com/dotnet/runtime/issues/34591", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)] - [ConditionalTheory(Helpers.IsDrawingSupported)] + [Theory] [MemberData(nameof(InvalidBytes_TestData))] public void FromStream_InvalidBytes_ThrowsArgumentException(byte[] bytes) { @@ -686,7 +688,7 @@ public void GetEncoderParameterList_ReturnsExpected(ImageFormat format, Guid[] e } [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, ".NET Framework throws ExternalException")] - [ConditionalFact(Helpers.IsDrawingSupported)] + [Fact] public void Save_InvalidDirectory_ThrowsDirectoryNotFoundException() { using (var bitmap = new Bitmap(1, 1)) diff --git a/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs index 405cf4373f9b8d..40fea32233194e 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs @@ -102,9 +102,11 @@ 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)] @@ -127,9 +129,11 @@ 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)] @@ -143,6 +147,7 @@ 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")); diff --git a/src/libraries/System.Runtime/tests/System/Runtime/JitInfoTests.cs b/src/libraries/System.Runtime/tests/System/Runtime/JitInfoTests.cs index f0a7eca83ee67b..f44266ebc1897c 100644 --- a/src/libraries/System.Runtime/tests/System/Runtime/JitInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System/Runtime/JitInfoTests.cs @@ -38,6 +38,7 @@ private long MakeAndInvokeDynamicSquareMethod(int input) } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))] // JitInfo metrics will be 0 in AOT scenarios + [ActiveIssue("https://github.com/dotnet/runtime/issues/55712", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)] public void JitInfoIsPopulated() { TimeSpan beforeCompilationTime = System.Runtime.JitInfo.GetCompilationTime(); diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 5217eb585644b3..6e39e1b2d12263 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -193,6 +193,9 @@ + + + @@ -225,6 +228,9 @@ + + +