From 932c67bd9dc28b9cdb353c4b9ee2cd25b3b0b35a Mon Sep 17 00:00:00 2001 From: Anton Firszov Date: Wed, 16 Aug 2017 01:57:22 +0200 Subject: [PATCH] ResizeTests use CompareToReferenceOutput now! --- .../Processors/Convolution/DetectEdgesTest.cs | 5 +- .../Processors/Transforms/ResizeTests.cs | 54 ++++++++++--------- tests/Images/External | 2 +- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs index 3e23b8ba47..c753528f38 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/DetectEdgesTest.cs @@ -16,8 +16,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution public class DetectEdgesTest : FileTestBase { public static readonly string[] CommonTestImages = { TestImages.Png.Bike }; - public static readonly string[] GrayscaleTestImages = { TestImages.Png.BikeGrayscale }; - + public static readonly TheoryData DetectEdgesFilters = new TheoryData { EdgeDetection.Kayyali, @@ -70,7 +69,7 @@ namespace ImageSharp.Tests.Processing.Processors.Convolution } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void DetectEdges_InBox(TestImageProvider provider) where TPixel : struct, IPixel { diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs index c6585edaa7..455cf55e65 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs @@ -8,15 +8,15 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms { using ImageSharp.PixelFormats; using ImageSharp.Processing; + using ImageSharp.Tests.TestUtilities.ImageComparison; + using SixLabors.Primitives; using Xunit; public class ResizeTests : FileTestBase { public static readonly string[] CommonTestImages = { TestImages.Png.CalliphoraPartial }; - - public static readonly string[] GrayscaleTestImages = { TestImages.Png.CalliphoraPartialGrayscale }; - + public static readonly TheoryData AllReSamplers = new TheoryData { @@ -47,7 +47,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms SizeF newSize = image.Size() * ratio; image.Mutate(x => x.Resize((Size)newSize, sampler, false)); string details = $"{name}-{ratio}"; - image.DebugSave(provider, details); + image.CompareToReferenceOutput(provider, details); } } @@ -59,7 +59,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(image.Size() / 2, true)); - image.DebugSave(provider); + image.CompareToReferenceOutput(provider); } } @@ -71,7 +71,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, true)); - image.DebugSave(provider); + image.CompareToReferenceOutput(provider); } } @@ -83,12 +83,14 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, true)); + + // Comparer fights decoder with gif-s. Could not use CompareToReferenceOutput here :( image.DebugSave(provider, extension: Extensions.Gif); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeFromSourceRectangle(TestImageProvider provider) where TPixel : struct, IPixel { @@ -98,36 +100,36 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms var destRectangle = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2); image.Mutate(x => x.Resize(image.Width, image.Height, new BicubicResampler(), sourceRectangle, destRectangle, false)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWidthAndKeepAspect(TestImageProvider provider) where TPixel : struct, IPixel { using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(image.Width / 3, 0, false)); - image.DebugSave(provider); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeHeightAndKeepAspect(TestImageProvider provider) where TPixel : struct, IPixel { using (Image image = provider.GetImage()) { image.Mutate(x => x.Resize(0, image.Height / 3, false)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWithCropWidthMode(TestImageProvider provider) where TPixel : struct, IPixel { @@ -139,12 +141,12 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWithCropHeightMode(TestImageProvider provider) where TPixel : struct, IPixel { @@ -156,12 +158,12 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWithPadMode(TestImageProvider provider) where TPixel : struct, IPixel { @@ -174,12 +176,12 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWithBoxPadMode(TestImageProvider provider) where TPixel : struct, IPixel { @@ -192,12 +194,12 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWithMaxMode(TestImageProvider provider) where TPixel : struct, IPixel { @@ -210,12 +212,12 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWithMinMode(TestImageProvider provider) where TPixel : struct, IPixel { @@ -228,12 +230,12 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } [Theory] - [WithFileCollection(nameof(GrayscaleTestImages), DefaultPixelType)] + [WithFileCollection(nameof(CommonTestImages), DefaultPixelType)] public void ResizeWithStretchMode(TestImageProvider provider) where TPixel : struct, IPixel { @@ -246,7 +248,7 @@ namespace ImageSharp.Tests.Processing.Processors.Transforms }; image.Mutate(x => x.Resize(options)); - image.DebugSave(provider, grayscale: true); + image.CompareToReferenceOutput(provider); } } diff --git a/tests/Images/External b/tests/Images/External index ec2161042f..fcd68139fc 160000 --- a/tests/Images/External +++ b/tests/Images/External @@ -1 +1 @@ -Subproject commit ec2161042fe9addeff10fab73b0a3d71172b86a8 +Subproject commit fcd68139fcc6f0ce9af29b716eb1f3874128315e