Add quantizer property tests

JimBobSquarePants · JimBobSquarePants · commit fc7219d1fa20 · 2023-05-19T23:58:03.000+10:00
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
@@ -46,17 +46,20 @@ public class BmpEncoderTests
         { Bit32Rgb, BmpBitsPerPixel.Pixel32 }
     };
 
+    [Fact]
+    public void BmpEncoderDefaultInstanceHasQuantizer() => Assert.NotNull(BmpEncoder.Quantizer);
+
     [Theory]
     [MemberData(nameof(RatioFiles))]
     public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
     {
-        var testFile = TestFile.Create(imagePath);
+        TestFile testFile = TestFile.Create(imagePath);
         using Image<Rgba32> input = testFile.CreateRgba32Image();
-        using var memStream = new MemoryStream();
+        using MemoryStream memStream = new();
         input.Save(memStream, BmpEncoder);
 
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         ImageMetadata meta = output.Metadata;
         Assert.Equal(xResolution, meta.HorizontalResolution);
         Assert.Equal(yResolution, meta.VerticalResolution);
@@ -67,13 +70,13 @@ public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolut
     [MemberData(nameof(BmpBitsPerPixelFiles))]
     public void Encode_PreserveBitsPerPixel(string imagePath, BmpBitsPerPixel bmpBitsPerPixel)
     {
-        var testFile = TestFile.Create(imagePath);
+        TestFile testFile = TestFile.Create(imagePath);
         using Image<Rgba32> input = testFile.CreateRgba32Image();
-        using var memStream = new MemoryStream();
+        using MemoryStream memStream = new();
         input.Save(memStream, BmpEncoder);
 
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         BmpMetadata meta = output.Metadata.GetBmpMetadata();
 
         Assert.Equal(bmpBitsPerPixel, meta.BitsPerPixel);
@@ -196,16 +199,16 @@ public void Encode_2Bit_WithV3Header_Works<TPixel>(
         where TPixel : unmanaged, IPixel<TPixel>
     {
         // arrange
-        var encoder = new BmpEncoder() { BitsPerPixel = bitsPerPixel };
-        using var memoryStream = new MemoryStream();
+        BmpEncoder encoder = new() { BitsPerPixel = bitsPerPixel };
+        using MemoryStream memoryStream = new();
         using Image<TPixel> input = provider.GetImage(BmpDecoder.Instance);
 
         // act
         encoder.Encode(input, memoryStream);
         memoryStream.Position = 0;
 
         // assert
-        using var actual = Image.Load<TPixel>(memoryStream);
+        using Image<TPixel> actual = Image.Load<TPixel>(memoryStream);
         ImageSimilarityReport similarityReport = ImageComparer.Exact.CompareImagesOrFrames(input, actual);
         Assert.True(similarityReport.IsEmpty, "encoded image does not match reference image");
     }
@@ -218,16 +221,16 @@ public void Encode_2Bit_WithV4Header_Works<TPixel>(
         where TPixel : unmanaged, IPixel<TPixel>
     {
         // arrange
-        var encoder = new BmpEncoder() { BitsPerPixel = bitsPerPixel };
-        using var memoryStream = new MemoryStream();
+        BmpEncoder encoder = new() { BitsPerPixel = bitsPerPixel };
+        using MemoryStream memoryStream = new();
         using Image<TPixel> input = provider.GetImage(BmpDecoder.Instance);
 
         // act
         encoder.Encode(input, memoryStream);
         memoryStream.Position = 0;
 
         // assert
-        using var actual = Image.Load<TPixel>(memoryStream);
+        using Image<TPixel> actual = Image.Load<TPixel>(memoryStream);
         ImageSimilarityReport similarityReport = ImageComparer.Exact.CompareImagesOrFrames(input, actual);
         Assert.True(similarityReport.IsEmpty, "encoded image does not match reference image");
     }
@@ -266,7 +269,7 @@ public void Encode_8BitColor_WithWuQuantizer<TPixel>(TestImageProvider<TPixel> p
         }
 
         using Image<TPixel> image = provider.GetImage();
-        var encoder = new BmpEncoder
+        BmpEncoder encoder = new()
         {
             BitsPerPixel = BmpBitsPerPixel.Pixel8,
             Quantizer = new WuQuantizer()
@@ -298,7 +301,7 @@ public void Encode_8BitColor_WithOctreeQuantizer<TPixel>(TestImageProvider<TPixe
         }
 
         using Image<TPixel> image = provider.GetImage();
-        var encoder = new BmpEncoder
+        BmpEncoder encoder = new()
         {
             BitsPerPixel = BmpBitsPerPixel.Pixel8,
             Quantizer = new OctreeQuantizer()
@@ -333,11 +336,11 @@ public void Encode_PreservesColorProfile<TPixel>(TestImageProvider<TPixel> provi
         ImageSharp.Metadata.Profiles.Icc.IccProfile expectedProfile = input.Metadata.IccProfile;
         byte[] expectedProfileBytes = expectedProfile.ToByteArray();
 
-        using var memStream = new MemoryStream();
+        using MemoryStream memStream = new();
         input.Save(memStream, new BmpEncoder());
 
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         ImageSharp.Metadata.Profiles.Icc.IccProfile actualProfile = output.Metadata.IccProfile;
         byte[] actualProfileBytes = actualProfile.ToByteArray();
 
@@ -353,7 +356,7 @@ public void Encode_WorksWithSizeGreaterThen65k(int width, int height)
         Exception exception = Record.Exception(() =>
         {
             using Image image = new Image<Rgba32>(width, height);
-            using var memStream = new MemoryStream();
+            using MemoryStream memStream = new();
             image.Save(memStream, BmpEncoder);
         });
 
@@ -387,7 +390,7 @@ private static void TestBmpEncoderCore<TPixel>(
             image.Mutate(c => c.MakeOpaque());
         }
 
-        var encoder = new BmpEncoder
+        BmpEncoder encoder = new()
         {
             BitsPerPixel = bitsPerPixel,
             SupportTransparency = supportTransparency,
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
@@ -33,6 +33,9 @@ public GifEncoderTests()
         }
     }
 
+    [Fact]
+    public void GifEncoderDefaultInstanceHasNullQuantizer() => Assert.Null(new GifEncoder().Quantizer);
+
     [Theory]
     [WithTestPatternImages(100, 100, TestPixelTypes, false)]
     [WithTestPatternImages(100, 100, TestPixelTypes, false)]
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -99,6 +99,9 @@ public static readonly TheoryData<PngCompressionLevel> CompressionLevels
         { TestImages.Png.Ratio4x1, 4, 1, PixelResolutionUnit.AspectRatio }
     };
 
+    [Fact]
+    public void PngEncoderDefaultInstanceHasNullQuantizer() => Assert.Null(PngEncoder.Quantizer);
+
     [Theory]
     [WithFile(TestImages.Png.Palette8Bpp, nameof(PngColorTypes), PixelTypes.Rgba32)]
     [WithTestPatternImages(nameof(PngColorTypes), 48, 24, PixelTypes.Rgba32)]
@@ -129,8 +132,8 @@ public void IsNotBoundToSinglePixelType<TPixel>(TestImageProvider<TPixel> provid
                 PngFilterMethod.Adaptive,
                 PngBitDepth.Bit8,
                 interlaceMode,
-                appendPixelType: true,
-                appendPngColorType: true);
+                appendPngColorType: true,
+                appendPixelType: true);
         }
     }
 
@@ -321,7 +324,7 @@ public void WritesFileMarker<TPixel>(TestImageProvider<TPixel> provider)
         where TPixel : unmanaged, IPixel<TPixel>
     {
         using Image<TPixel> image = provider.GetImage();
-        using var ms = new MemoryStream();
+        using MemoryStream ms = new();
         image.Save(ms, PngEncoder);
 
         byte[] data = ms.ToArray().Take(8).ToArray();
@@ -344,13 +347,13 @@ public void WritesFileMarker<TPixel>(TestImageProvider<TPixel> provider)
     [MemberData(nameof(RatioFiles))]
     public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolution, PixelResolutionUnit resolutionUnit)
     {
-        var testFile = TestFile.Create(imagePath);
+        TestFile testFile = TestFile.Create(imagePath);
         using Image<Rgba32> input = testFile.CreateRgba32Image();
-        using var memStream = new MemoryStream();
+        using MemoryStream memStream = new();
         input.Save(memStream, PngEncoder);
 
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         ImageMetadata meta = output.Metadata;
         Assert.Equal(xResolution, meta.HorizontalResolution);
         Assert.Equal(yResolution, meta.VerticalResolution);
@@ -361,13 +364,13 @@ public void Encode_PreserveRatio(string imagePath, int xResolution, int yResolut
     [MemberData(nameof(PngBitDepthFiles))]
     public void Encode_PreserveBits(string imagePath, PngBitDepth pngBitDepth)
     {
-        var testFile = TestFile.Create(imagePath);
+        TestFile testFile = TestFile.Create(imagePath);
         using Image<Rgba32> input = testFile.CreateRgba32Image();
-        using var memStream = new MemoryStream();
+        using MemoryStream memStream = new();
         input.Save(memStream, PngEncoder);
 
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         PngMetadata meta = output.Metadata.GetPngMetadata();
 
         Assert.Equal(pngBitDepth, meta.BitDepth);
@@ -380,8 +383,8 @@ public void Encode_PreserveBits(string imagePath, PngBitDepth pngBitDepth)
     public void Encode_WithPngTransparentColorBehaviorClear_Works(PngColorType colorType)
     {
         // arrange
-        var image = new Image<Rgba32>(50, 50);
-        var encoder = new PngEncoder()
+        Image<Rgba32> image = new(50, 50);
+        PngEncoder encoder = new()
         {
             TransparentColorMode = PngTransparentColorMode.Clear,
             ColorType = colorType
@@ -391,7 +394,7 @@ public void Encode_WithPngTransparentColorBehaviorClear_Works(PngColorType color
         {
             for (int y = 0; y < image.Height; y++)
             {
-                System.Span<Rgba32> rowSpan = accessor.GetRowSpan(y);
+                Span<Rgba32> rowSpan = accessor.GetRowSpan(y);
 
                 // Half of the test image should be transparent.
                 if (y > 25)
@@ -407,12 +410,12 @@ public void Encode_WithPngTransparentColorBehaviorClear_Works(PngColorType color
         });
 
         // act
-        using var memStream = new MemoryStream();
+        using MemoryStream memStream = new();
         image.Save(memStream, encoder);
 
         // assert
         memStream.Position = 0;
-        using var actual = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> actual = Image.Load<Rgba32>(memStream);
         Rgba32 expectedColor = Color.Blue;
         if (colorType is PngColorType.Grayscale or PngColorType.GrayscaleWithAlpha)
         {
@@ -424,7 +427,7 @@ public void Encode_WithPngTransparentColorBehaviorClear_Works(PngColorType color
         {
             for (int y = 0; y < accessor.Height; y++)
             {
-                System.Span<Rgba32> rowSpan = accessor.GetRowSpan(y);
+                Span<Rgba32> rowSpan = accessor.GetRowSpan(y);
 
                 if (y > 25)
                 {
@@ -443,15 +446,15 @@ public void Encode_WithPngTransparentColorBehaviorClear_Works(PngColorType color
     [MemberData(nameof(PngTrnsFiles))]
     public void Encode_PreserveTrns(string imagePath, PngBitDepth pngBitDepth, PngColorType pngColorType)
     {
-        var testFile = TestFile.Create(imagePath);
+        TestFile testFile = TestFile.Create(imagePath);
         using Image<Rgba32> input = testFile.CreateRgba32Image();
         PngMetadata inMeta = input.Metadata.GetPngMetadata();
         Assert.True(inMeta.HasTransparency);
 
-        using var memStream = new MemoryStream();
+        using MemoryStream memStream = new();
         input.Save(memStream, PngEncoder);
         memStream.Position = 0;
-        using var output = Image.Load<Rgba32>(memStream);
+        using Image<Rgba32> output = Image.Load<Rgba32>(memStream);
         PngMetadata outMeta = output.Metadata.GetPngMetadata();
         Assert.True(outMeta.HasTransparency);
 
@@ -501,8 +504,8 @@ public void Encode_WorksWithDiscontiguousBuffers<TPixel>(TestImageProvider<TPixe
                 PngFilterMethod.Adaptive,
                 PngBitDepth.Bit8,
                 interlaceMode,
-                appendPixelType: true,
-                appendPngColorType: true);
+                appendPngColorType: true,
+                appendPixelType: true);
         }
     }
 
@@ -523,8 +526,8 @@ static void RunTest(string serialized)
                     PngFilterMethod.Adaptive,
                     PngBitDepth.Bit8,
                     interlaceMode,
-                    appendPixelType: true,
-                    appendPngColorType: true);
+                    appendPngColorType: true,
+                    appendPixelType: true);
             }
         }
 
@@ -538,8 +541,8 @@ static void RunTest(string serialized)
     public void EncodeFixesInvalidOptions()
     {
         // https://github.com/SixLabors/ImageSharp/issues/935
-        using var ms = new MemoryStream();
-        var testFile = TestFile.Create(TestImages.Png.Issue935);
+        using MemoryStream ms = new();
+        TestFile testFile = TestFile.Create(TestImages.Png.Issue935);
         using Image<Rgba32> image = testFile.CreateRgba32Image(PngDecoder.Instance);
 
         image.Save(ms, new PngEncoder { ColorType = PngColorType.RgbWithAlpha });
@@ -563,7 +566,7 @@ private static void TestPngEncoderCore<TPixel>(
             where TPixel : unmanaged, IPixel<TPixel>
     {
         using Image<TPixel> image = provider.GetImage();
-        var encoder = new PngEncoder
+        PngEncoder encoder = new()
         {
             ColorType = pngColorType,
             FilterMethod = pngFilterMethod,
@@ -581,7 +584,7 @@ private static void TestPngEncoderCore<TPixel>(
         string pngBitDepthInfo = appendPngBitDepth ? bitDepth.ToString() : string.Empty;
         string pngInterlaceModeInfo = interlaceMode != PngInterlaceMode.None ? $"_{interlaceMode}" : string.Empty;
 
-        string debugInfo = $"{pngColorTypeInfo}{pngFilterMethodInfo}{compressionLevelInfo}{paletteSizeInfo}{pngBitDepthInfo}{pngInterlaceModeInfo}";
+        string debugInfo = pngColorTypeInfo + pngFilterMethodInfo + compressionLevelInfo + paletteSizeInfo + pngBitDepthInfo + pngInterlaceModeInfo;
 
         string actualOutputFile = provider.Utility.SaveTestOutputFile(image, "png", encoder, debugInfo, appendPixelType);
 
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ public GifEncoderTests()`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ [Fact]`
	`37`	`+ public void GifEncoderDefaultInstanceHasNullQuantizer() => Assert.Null(new GifEncoder().Quantizer);`
	`38`	`+`
`36`	`39`	`[Theory]`
`37`	`40`	`[WithTestPatternImages(100, 100, TestPixelTypes, false)]`
`38`	`41`	`[WithTestPatternImages(100, 100, TestPixelTypes, false)]`