Skip to content

Remove mac specific skips #2384

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

Merged
merged 8 commits into from
Mar 8, 2023
Merged

Remove mac specific skips #2384

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b661c07
Remove mac specific skips
stefannikolei Mar 5, 2023
56de9e7
Disable MemoryAllocator tests
stefannikolei Mar 8, 2023
4fb8e0d
Update tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemor…
stefannikolei Mar 8, 2023
1827794
Merge branch 'main' into stefannikolei/mac
JimBobSquarePants Mar 8, 2023
a613dc9
Update tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
stefannikolei Mar 8, 2023
7ebe387
Update tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
stefannikolei Mar 8, 2023
075e8a4
Update tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
stefannikolei Mar 8, 2023
47f532b
Apply suggestions from code review
stefannikolei Mar 8, 2023
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
98 changes: 49 additions & 49 deletions tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,13 @@ public void TiffDecoder_CanDecode_12Bit_WithUnassociatedAlpha<TPixel>(TestImageP
public void TiffDecoder_CanDecode_12Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel>
{
if (TestEnvironment.IsMacOS)
{
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
image.DebugSave(provider);
return;
}
// if (TestEnvironment.IsMacOS)
// {
// // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
// using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
// image.DebugSave(provider);
// return;
// }

TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.264F);
}
Expand Down Expand Up @@ -258,13 +258,13 @@ public void TiffDecoder_CanDecode_20Bit_WithAssociatedAlpha<TPixel>(TestImagePro

where TPixel : unmanaged, IPixel<TPixel>
{
if (TestEnvironment.IsMacOS)
{
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
image.DebugSave(provider);
return;
}
// if (TestEnvironment.IsMacOS)
// {
// // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
// using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
// image.DebugSave(provider);
// return;
// }

TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.376F);
}
Expand All @@ -284,13 +284,13 @@ public void TiffDecoder_CanDecode_24Bit_WithUnassociatedAlpha<TPixel>(TestImageP
public void TiffDecoder_CanDecode_24Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel>
{
if (TestEnvironment.IsMacOS)
{
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
image.DebugSave(provider);
return;
}
// if (TestEnvironment.IsMacOS)
// {
// // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
// using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
// image.DebugSave(provider);
// return;
// }

TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.405F);
}
Expand Down Expand Up @@ -385,13 +385,13 @@ public void TiffDecoder_CanDecode_32Bit_WithUnassociatedAlpha<TPixel>(TestImageP
public void TiffDecoder_CanDecode_32Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel>
{
if (TestEnvironment.IsMacOS)
{
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
image.DebugSave(provider);
return;
}
// if (TestEnvironment.IsMacOS)
// {
// // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
// using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
// image.DebugSave(provider);
// return;
// }

// Note: Using tolerant comparer here, because there is a small difference to the reference decoder probably due to floating point rounding issues.
TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.004F);
Expand Down Expand Up @@ -425,13 +425,13 @@ public void TiffDecoder_CanDecode_40Bit_WithUnassociatedAlpha<TPixel>(TestImageP
public void TiffDecoder_CanDecode_40Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel>
{
if (TestEnvironment.IsMacOS)
{
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
image.DebugSave(provider);
return;
}
// if (TestEnvironment.IsMacOS)
// {
// // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
// using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
// image.DebugSave(provider);
// return;
// }

TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.247F);
}
Expand Down Expand Up @@ -463,13 +463,13 @@ public void TiffDecoder_CanDecode_48Bit_WithUnassociatedAlpha<TPixel>(TestImageP
public void TiffDecoder_CanDecode_48Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel>
{
if (TestEnvironment.IsMacOS)
{
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
image.DebugSave(provider);
return;
}
// if (TestEnvironment.IsMacOS)
// {
// // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
// using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
// image.DebugSave(provider);
// return;
// }

TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.118F);
}
Expand All @@ -492,13 +492,13 @@ public void TiffDecoder_CanDecode_56Bit_WithUnassociatedAlpha<TPixel>(TestImageP
public void TiffDecoder_CanDecode_56Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
where TPixel : unmanaged, IPixel<TPixel>
{
if (TestEnvironment.IsMacOS)
{
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
image.DebugSave(provider);
return;
}
// if (TestEnvironment.IsMacOS)
// {
// // Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
// using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
// image.DebugSave(provider);
// return;
// }

TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.075F);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ResizeTests
};

private static readonly ImageComparer ValidatorComparer =
ImageComparer.TolerantPercentage(TestEnvironment.IsMacOS && TestEnvironment.RunsOnCI ? 0.26F : 0.07F);
ImageComparer.TolerantPercentage(0.07F);

[Fact]
public void Resize_PixelAgnostic()
Expand Down