Skip to content

Commit 0c8efbe

Browse files
Merge pull request #2384 from stefannikolei/stefannikolei/mac
Remove mac specific skips
2 parents da5b556 + 47f532b commit 0c8efbe

File tree

2 files changed

+1
-50
lines changed

2 files changed

+1
-50
lines changed

tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,6 @@ public void TiffDecoder_CanDecode_12Bit_WithUnassociatedAlpha<TPixel>(TestImageP
202202
public void TiffDecoder_CanDecode_12Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
203203
where TPixel : unmanaged, IPixel<TPixel>
204204
{
205-
if (TestEnvironment.IsMacOS)
206-
{
207-
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
208-
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
209-
image.DebugSave(provider);
210-
return;
211-
}
212205

213206
TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.264F);
214207
}
@@ -258,13 +251,6 @@ public void TiffDecoder_CanDecode_20Bit_WithAssociatedAlpha<TPixel>(TestImagePro
258251

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

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

295274
TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.405F);
296275
}
@@ -385,13 +364,6 @@ public void TiffDecoder_CanDecode_32Bit_WithUnassociatedAlpha<TPixel>(TestImageP
385364
public void TiffDecoder_CanDecode_32Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
386365
where TPixel : unmanaged, IPixel<TPixel>
387366
{
388-
if (TestEnvironment.IsMacOS)
389-
{
390-
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
391-
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
392-
image.DebugSave(provider);
393-
return;
394-
}
395367

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

436401
TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.247F);
437402
}
@@ -463,13 +428,6 @@ public void TiffDecoder_CanDecode_48Bit_WithUnassociatedAlpha<TPixel>(TestImageP
463428
public void TiffDecoder_CanDecode_48Bit_WithAssociatedAlpha<TPixel>(TestImageProvider<TPixel> provider)
464429
where TPixel : unmanaged, IPixel<TPixel>
465430
{
466-
if (TestEnvironment.IsMacOS)
467-
{
468-
// Only debug save on OSX: For some reason the reference image has a difference of 50%. The imagesharp output file looks ok though.
469-
using Image<TPixel> image = provider.GetImage(TiffDecoder.Instance);
470-
image.DebugSave(provider);
471-
return;
472-
}
473431

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

503454
TestTiffDecoder(provider, useExactComparer: false, compareTolerance: 0.075F);
504455
}

tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class ResizeTests
3131
};
3232

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

3636
[Fact]
3737
public void Resize_PixelAgnostic()

0 commit comments

Comments
 (0)