Browse Source

Disable failing RemoteExecutor tests on NETFX.

js/color-alpha-handling
James Jackson-South 6 years ago
parent
commit
7909bc1e65
  1. 2
      Directory.Build.targets
  2. 1
      tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
  3. 1
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
  4. 1
      tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
  5. 1
      tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
  6. 1
      tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs
  7. 59
      tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs

2
Directory.Build.targets

@ -18,7 +18,7 @@
<!-- Package versions for package references across all projects --> <!-- Package versions for package references across all projects -->
<ItemGroup> <ItemGroup>
<!--Global Dependencies--> <!--Global Dependencies-->
<PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.3.1" /> <PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.7.0" />
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" /> <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
<PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" /> <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />

1
tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

@ -195,6 +195,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
Assert.IsType<InvalidMemoryOperationException>(ex.InnerException); Assert.IsType<InvalidMemoryOperationException>(ex.InnerException);
} }
[ActiveIssue("https://github.com/dotnet/arcade/issues/6393", TargetFrameworkMonikers.NetFramework)]
[Theory] [Theory]
[WithFile(TestImages.Gif.Giphy, PixelTypes.Rgba32)] [WithFile(TestImages.Gif.Giphy, PixelTypes.Rgba32)]
[WithFile(TestImages.Gif.Kumin, PixelTypes.Rgba32)] [WithFile(TestImages.Gif.Kumin, PixelTypes.Rgba32)]

1
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs

@ -13,6 +13,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
{ {
public const string DecodeProgressiveJpegOutputName = "DecodeProgressiveJpeg"; public const string DecodeProgressiveJpegOutputName = "DecodeProgressiveJpeg";
[ActiveIssue("https://github.com/dotnet/arcade/issues/6393", TargetFrameworkMonikers.NetFramework)]
[Theory] [Theory]
[WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32, false)] [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32, false)]
[WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32, true)] [WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32, true)]

1
tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs

@ -401,6 +401,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
Assert.IsType<InvalidMemoryOperationException>(ex.InnerException); Assert.IsType<InvalidMemoryOperationException>(ex.InnerException);
} }
[ActiveIssue("https://github.com/dotnet/arcade/issues/6393", TargetFrameworkMonikers.NetFramework)]
[Theory] [Theory]
[WithFile(TestImages.Png.Splash, PixelTypes.Rgba32)] [WithFile(TestImages.Png.Splash, PixelTypes.Rgba32)]
[WithFile(TestImages.Png.Bike, PixelTypes.Rgba32)] [WithFile(TestImages.Png.Bike, PixelTypes.Rgba32)]

1
tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@ -534,6 +534,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
} }
} }
[ActiveIssue("https://github.com/dotnet/arcade/issues/6393", TargetFrameworkMonikers.NetFramework)]
[Theory] [Theory]
[WithTestPatternImages(100, 100, PixelTypes.Rgba32)] [WithTestPatternImages(100, 100, PixelTypes.Rgba32)]
public void EncodeWorksWithoutSsse3Intrinsics<TPixel>(TestImageProvider<TPixel> provider) public void EncodeWorksWithoutSsse3Intrinsics<TPixel>(TestImageProvider<TPixel> provider)

1
tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs

@ -744,6 +744,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tga
Assert.IsType<InvalidMemoryOperationException>(ex.InnerException); Assert.IsType<InvalidMemoryOperationException>(ex.InnerException);
} }
[ActiveIssue("https://github.com/dotnet/arcade/issues/6393", TargetFrameworkMonikers.NetFramework)]
[Theory] [Theory]
[WithFile(Bit24BottomLeft, PixelTypes.Rgba32)] [WithFile(Bit24BottomLeft, PixelTypes.Rgba32)]
[WithFile(Bit32BottomLeft, PixelTypes.Rgba32)] [WithFile(Bit32BottomLeft, PixelTypes.Rgba32)]

59
tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs

@ -138,21 +138,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
public void BokehBlurFilterProcessor<TPixel>(TestImageProvider<TPixel> provider, BokehBlurInfo value) public void BokehBlurFilterProcessor<TPixel>(TestImageProvider<TPixel> provider, BokehBlurInfo value)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
static void RunTest(string providerDump, string infoDump) provider.RunValidatingProcessorTest(
{ x => x.BokehBlur(value.Radius, value.Components, value.Gamma),
TestImageProvider<TPixel> provider = testOutputDetails: value.ToString(),
BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump); appendPixelTypeToFileName: false);
BokehBlurInfo value = BasicSerializer.Deserialize<BokehBlurInfo>(infoDump);
provider.RunValidatingProcessorTest(
x => x.BokehBlur(value.Radius, value.Components, value.Gamma),
testOutputDetails: value.ToString(),
appendPixelTypeToFileName: false);
}
RemoteExecutor
.Invoke(RunTest, BasicSerializer.Serialize(provider), BasicSerializer.Serialize(value))
.Dispose();
} }
[Theory] [Theory]
@ -164,18 +153,9 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
public void BokehBlurFilterProcessor_WorksWithAllPixelTypes<TPixel>(TestImageProvider<TPixel> provider) public void BokehBlurFilterProcessor_WorksWithAllPixelTypes<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
static void RunTest(string providerDump) provider.RunValidatingProcessorTest(
{
TestImageProvider<TPixel> provider =
BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
provider.RunValidatingProcessorTest(
x => x.BokehBlur(8, 2, 3), x => x.BokehBlur(8, 2, 3),
appendSourceFileOrDescription: false); appendSourceFileOrDescription: false);
}
RemoteExecutor
.Invoke(RunTest, BasicSerializer.Serialize(provider))
.Dispose();
} }
[Theory] [Theory]
@ -183,26 +163,15 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
public void BokehBlurFilterProcessor_Bounded<TPixel>(TestImageProvider<TPixel> provider, BokehBlurInfo value) public void BokehBlurFilterProcessor_Bounded<TPixel>(TestImageProvider<TPixel> provider, BokehBlurInfo value)
where TPixel : unmanaged, IPixel<TPixel> where TPixel : unmanaged, IPixel<TPixel>
{ {
static void RunTest(string providerDump, string infoDump) provider.RunValidatingProcessorTest(
{ x =>
TestImageProvider<TPixel> provider = {
BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump); Size size = x.GetCurrentSize();
BokehBlurInfo value = BasicSerializer.Deserialize<BokehBlurInfo>(infoDump); var bounds = new Rectangle(10, 10, size.Width / 2, size.Height / 2);
x.BokehBlur(value.Radius, value.Components, value.Gamma, bounds);
provider.RunValidatingProcessorTest( },
x => testOutputDetails: value.ToString(),
{ appendPixelTypeToFileName: false);
Size size = x.GetCurrentSize();
var bounds = new Rectangle(10, 10, size.Width / 2, size.Height / 2);
x.BokehBlur(value.Radius, value.Components, value.Gamma, bounds);
},
testOutputDetails: value.ToString(),
appendPixelTypeToFileName: false);
}
RemoteExecutor
.Invoke(RunTest, BasicSerializer.Serialize(provider), BasicSerializer.Serialize(value))
.Dispose();
} }
[Theory] [Theory]

Loading…
Cancel
Save