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

mark all BinaryFormatter-related tests as conditional #103471

Merged
merged 5 commits into from
Jun 17, 2024
Merged

mark all BinaryFormatter-related tests as conditional #103471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c5a17c6
mark all BinaryFormatter-related tests as conditional that require Pl…
adamsitnik Jun 14, 2024
0e24bc7
two types in inheritance hierarchy can not use [ConditionalClass] wit…
adamsitnik Jun 14, 2024
1d2a136
Apply suggestions from code review
adamsitnik Jun 14, 2024
af9d337
Merge remote-tracking branch 'upstream/main' into disableBFtestOnMobiles
adamsitnik Jun 17, 2024
de3c046
don't run BinaryFormatter tests for NativeAOT and Mobiles (they are n…
adamsitnik Jun 17, 2024
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
1 change: 1 addition & 0 deletions ...libraries/System.Resources.Extensions/tests/BinaryFormatTests/Common/SerializationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace System.Resources.Extensions.Tests.Common;

[ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public abstract class SerializationTest<TSerializer> where TSerializer : ISerializer
{
public static TheoryData<FormatterTypeStyle, FormatterAssemblyStyle> FormatterOptions => new()
Expand Down
7 changes: 4 additions & 3 deletions ...ibraries/System.Resources.Extensions/tests/BinaryFormatTests/Common/SystemDrawingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@

namespace System.Resources.Extensions.Tests.Common;

[ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsDrawingSupported))]
// This type can not be annotated with [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsDrawingSupported))]
// because the base type is annotated with [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public abstract class SystemDrawingTests<T> : SerializationTest<T> where T : ISerializer
{
[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsDrawingSupported), nameof(PlatformDetection.SupportsComInterop))]
[MemberData(nameof(FormatterOptions))]
[SupportedOSPlatform("windows")]
public void Bitmap_RoundTrip(FormatterTypeStyle typeStyle, FormatterAssemblyStyle assemblyMatching)
Expand All @@ -20,7 +21,7 @@ public void Bitmap_RoundTrip(FormatterTypeStyle typeStyle, FormatterAssemblyStyl
deserialized.Size.Should().Be(bitmap.Size);
}

[Theory]
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsDrawingSupported), nameof(PlatformDetection.SupportsComInterop))]
[MemberData(nameof(FormatterOptions))]
[SupportedOSPlatform("windows")]
public void Png_RoundTrip(FormatterTypeStyle typeStyle, FormatterAssemblyStyle assemblyMatching)
Expand Down
1 change: 1 addition & 0 deletions ...stem.Resources.Extensions/tests/BinaryFormatTests/FormattedObject/BinaryFormattedTypes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace System.Resources.Extensions.Tests.FormattedObject;

[ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public class BinaryFormattedTypes
{
[Theory]
Expand Down
4 changes: 2 additions & 2 deletions ...System.Resources.Extensions/tests/BinaryFormatTests/FormattedObject/SystemDrawingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace System.Resources.Extensions.Tests.FormattedObject;

public class SystemDrawingTests : Common.SystemDrawingTests<FormattedObjectSerializer>
{
[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDrawingSupported))]
public void PointF_Parse()
{
PointF input = new() { X = 123.5f, Y = 456.1f };
Expand All @@ -26,7 +26,7 @@ public void PointF_Parse()
classInfo.GetSingle("y").Should().Be(input.Y);
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsDrawingSupported))]
public void RectangleF_Parse()
{
RectangleF input = new(x: 123.5f, y: 456.1f, width: 100.25f, height: 200.75f);
Expand Down
1 change: 1 addition & 0 deletions ...raries/System.Resources.Extensions/tests/BinaryFormatTests/Legacy/BinaryFormatterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

namespace BinaryFormatTests.FormatterTests;

[ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsBinaryFormatterSupported))]
public partial class BinaryFormatterTests
{
[Theory]
Expand Down
7 changes: 5 additions & 2 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,11 @@
<ProjectExclusions Remove="$(MSBuildThisFileDirectory)System.Collections\tests\System.Collections.Tests.csproj" />
<ProjectExclusions Remove="$(MSBuildThisFileDirectory)System.IO.IsolatedStorage\tests\System.IO.IsolatedStorage.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TestNativeAot)' == 'true' or '$(TargetsMobile)' == 'true'">
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.Extensions\tests\BinaryFormatTests\System.Resources.Extensions.BinaryFormat.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.Extensions\tests\CompatTests\System.Resources.Extensions.Compat.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TestNativeAot)' == 'true' and '$(RunDisabledNativeAotTests)' != 'true'">
<!-- https://github.com/dotnet/runtime/issues/72908 -->
Expand Down Expand Up @@ -506,8 +511,6 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Mail\tests\Functional\System.Net.Mail.Functional.Tests.csproj"
Condition="'$(TargetOS)' == 'windows'"/>

<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.Extensions\tests\CompatTests\System.Resources.Extensions.Compat.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Resources.Extensions\tests\BinaryFormatTests\System.Resources.Extensions.BinaryFormat.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.VisualBasic.Core\tests\Microsoft.VisualBasic.Core.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.CodeDom\tests\System.CodeDom.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.ComponentModel.Annotations\tests\System.ComponentModel.Annotations.Tests.csproj" />
Expand Down
Loading