From abbf9e78e013b2adbda5dc9d9e1fe66ffbcab434 Mon Sep 17 00:00:00 2001
From: James Jackson-South <james_south@hotmail.com>
Date: Wed, 14 Oct 2020 22:48:56 +0100
Subject: [PATCH] Split out progressive jpeg decoding tests

---
 .../Formats/Gif/GifDecoderTests.cs            |  2 +-
 .../Jpg/JpegDecoderTests.Progressive.cs       | 27 +++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
index 2e2da8d6a..1256520e6 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
@@ -209,7 +209,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
                 provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
 
                 using Image<TPixel> image = provider.GetImage(GifDecoder);
-                image.DebugSave(provider);
+                image.DebugSave(provider, nonContiguousBuffersStr);
                 image.CompareToOriginal(provider);
             }
 
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
index 62873a1c7..5bf80580e 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs
@@ -13,11 +13,25 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
     {
         public const string DecodeProgressiveJpegOutputName = "DecodeProgressiveJpeg";
 
+        [Theory]
+        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32)]
+        public void DecodeProgressiveJpeg<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using Image<TPixel> image = provider.GetImage(JpegDecoder);
+            image.DebugSave(provider);
+
+            provider.Utility.TestName = DecodeProgressiveJpegOutputName;
+            image.CompareToReferenceOutput(
+                GetImageComparer(provider),
+                provider,
+                appendPixelTypeToFileName: false);
+        }
+
         [ActiveIssue("https://github.com/dotnet/arcade/issues/6393", TargetFrameworkMonikers.NetFramework)]
         [Theory]
-        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32, false)]
-        [WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32, true)]
-        public void DecodeProgressiveJpeg<TPixel>(TestImageProvider<TPixel> provider, bool enforceDiscontiguousBuffers)
+        [WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32)]
+        public void DecodeProgressiveJpeg_WithLimitedAllocatorBufferCapacity<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
             static void RunTest(string providerDump, string nonContiguousBuffersStr)
@@ -25,10 +39,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                 TestImageProvider<TPixel> provider =
                     BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
 
-                if (!string.IsNullOrEmpty(nonContiguousBuffersStr))
-                {
-                    provider.LimitAllocatorBufferCapacity().InBytesSqrt(200);
-                }
+                provider.LimitAllocatorBufferCapacity().InBytesSqrt(200);
 
                 using Image<TPixel> image = provider.GetImage(JpegDecoder);
                 image.DebugSave(provider, nonContiguousBuffersStr);
@@ -45,7 +56,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             RemoteExecutor.Invoke(
                 RunTest,
                 providerDump,
-                enforceDiscontiguousBuffers ? "Disco" : string.Empty)
+                "Disco")
                 .Dispose();
         }
     }