From 67c66feb8bf65a8b9229347f3e6fc8abd2f66e09 Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Sun, 1 Apr 2018 01:45:19 +0200 Subject: [PATCH] reduce toleance values --- .../Processing/Processors/Dithering/DitherTests.cs | 4 ++-- .../Processing/Processors/Filters/BlackWhiteTest.cs | 3 ++- .../Processing/Processors/Filters/FilterTest.cs | 6 ++++-- tests/ImageSharp.Tests/TestUtilities/TestUtils.cs | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs index de2eff2ee..a82ca225c 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs @@ -75,7 +75,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization } [Theory] - [WithFile(TestImages.Png.Bike, CommonNonDefaultPixelTypes)] + [WithFile(TestImages.Png.Filter0, CommonNonDefaultPixelTypes)] public void DitherFilter_ShouldNotDependOnSinglePixelType(TestImageProvider provider) where TPixel : struct, IPixel { @@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization } [Theory] - [WithFile(TestImages.Png.Bike, CommonNonDefaultPixelTypes)] + [WithFile(TestImages.Png.Filter0, CommonNonDefaultPixelTypes)] public void DiffusionFilter_ShouldNotDependOnSinglePixelType(TestImageProvider provider) where TPixel : struct, IPixel { diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs index ccf9152f0..f360faff4 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/BlackWhiteTest.cs @@ -8,6 +8,7 @@ using Xunit; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters { using SixLabors.ImageSharp.Processing.Filters; + using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; [GroupOutput("Filters")] public class BlackWhiteTest @@ -17,7 +18,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters public void ApplyBlackWhiteFilter(TestImageProvider provider) where TPixel : struct, IPixel { - provider.RunValidatingProcessorTest(ctx => ctx.BlackWhite()); + provider.RunValidatingProcessorTest(ctx => ctx.BlackWhite(), comparer: ImageComparer.TolerantPercentage(0.002f)); } } } \ No newline at end of file diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs index 190e117b3..5c90b1334 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs @@ -16,6 +16,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters [GroupOutput("Filters")] public class FilterTest { + private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.02f); + // Testing the generic FilterProcessor with more than one pixel type intentionally. // There is no need to do this with the specialized ones. [Theory] @@ -25,7 +27,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters { Matrix4x4 m = CreateCombinedTestFilterMatrix(); - provider.RunValidatingProcessorTest(x => x.Filter(m)); + provider.RunValidatingProcessorTest(x => x.Filter(m), comparer: ValidatorComparer); } [Theory] @@ -35,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters { Matrix4x4 m = CreateCombinedTestFilterMatrix(); - provider.RunRectangleConstrainedValidatingProcessorTest((x, b) => x.Filter(m, b)); + provider.RunRectangleConstrainedValidatingProcessorTest((x, b) => x.Filter(m, b), comparer: ValidatorComparer); } private static Matrix4x4 CreateCombinedTestFilterMatrix() diff --git a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs index 530ff8ee7..9af3ce39c 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestUtils.cs @@ -167,7 +167,7 @@ namespace SixLabors.ImageSharp.Tests { if (comparer == null) { - comparer = ImageComparer.Tolerant(0.5f / 100); + comparer = ImageComparer.TolerantPercentage(0.001f); } using (Image image = provider.GetImage()) @@ -195,7 +195,7 @@ namespace SixLabors.ImageSharp.Tests { if (comparer == null) { - comparer = ImageComparer.Tolerant(0.5f / 100); + comparer = ImageComparer.TolerantPercentage(0.001f); } using (Image image = provider.GetImage())