Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable failing graphics tests on windows 7 #71151

Merged
merged 3 commits into from
Jun 29, 2022
Merged

Disable failing graphics tests on windows 7 #71151

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0caf1af
Disable failing graphics tests on windows 7
ViktorHofer Jun 22, 2022
d5f1417
Update GraphicsTests.cs
ViktorHofer Jun 29, 2022
6912954
Update GraphicsTests.cs
ViktorHofer Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/libraries/System.Drawing.Common/tests/GraphicsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ namespace System.Drawing.Tests
{
public partial class GraphicsTests
{
public static bool IsWindows7OrWindowsArm64 => PlatformDetection.IsWindows7 || (PlatformDetection.IsWindows && PlatformDetection.IsArm64Process);

[ConditionalFact(Helpers.IsDrawingSupported)]
public void GetHdc_FromHdc_Roundtrips()
{
Expand Down Expand Up @@ -93,7 +95,7 @@ public static IEnumerable<object[]> FromHdc_TestData()
yield return new object[] { Helpers.GetDC(foregroundWindow) };
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows10OrLater))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(GraphicsTests), nameof(IsWindows7OrWindowsArm64))]
[ConditionalTheory(Helpers.IsDrawingSupported)]
[MemberData(nameof(FromHdc_TestData))]
public void FromHdc_ValidHdc_ReturnsExpected(IntPtr hdc)
Expand All @@ -105,7 +107,7 @@ public void FromHdc_ValidHdc_ReturnsExpected(IntPtr hdc)
}
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows10OrLater))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(GraphicsTests), nameof(IsWindows7OrWindowsArm64))]
[ConditionalTheory(Helpers.IsDrawingSupported)]
[MemberData(nameof(FromHdc_TestData))]
public void FromHdc_ValidHdcWithContext_ReturnsExpected(IntPtr hdc)
Expand All @@ -117,7 +119,7 @@ public void FromHdc_ValidHdcWithContext_ReturnsExpected(IntPtr hdc)
}
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows10OrLater))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(GraphicsTests), nameof(IsWindows7OrWindowsArm64))]
[ConditionalTheory(Helpers.IsDrawingSupported)]
[MemberData(nameof(FromHdc_TestData))]
public void FromHdcInternal_GetDC_ReturnsExpected(IntPtr hdc)
Expand Down Expand Up @@ -245,7 +247,7 @@ public static IEnumerable<object[]> Hwnd_TestData()
yield return new object[] { Helpers.GetForegroundWindow() };
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows10OrLater))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(GraphicsTests), nameof(IsWindows7OrWindowsArm64))]
[ConditionalTheory(Helpers.IsDrawingSupported)]
[MemberData(nameof(Hwnd_TestData))]
public void FromHwnd_ValidHwnd_ReturnsExpected(IntPtr hWnd)
Expand All @@ -257,7 +259,7 @@ public void FromHwnd_ValidHwnd_ReturnsExpected(IntPtr hWnd)
}
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(PlatformDetection), nameof(PlatformDetection.IsArm64Process), nameof(PlatformDetection.IsWindows10OrLater))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/51097", typeof(GraphicsTests), nameof(IsWindows7OrWindowsArm64))]
[ConditionalTheory(Helpers.IsDrawingSupported)]
[MemberData(nameof(Hwnd_TestData))]
public void FromHwndInternal_ValidHwnd_ReturnsExpected(IntPtr hWnd)
Expand Down