Merge pull request #1885 from SixLabors/bp/removeRunSerial

Remove RunSerial from tests
SixLabors · Dec 12, 2021 · 93e4faa · 93e4faa
2 parents ca8e984 + edf7014
commit 93e4faa
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 52 deletions.
diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
@@ -19,7 +19,6 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Bmp
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Bmp")]
     public class BmpDecoderTests
     {

diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
@@ -17,27 +17,26 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Bmp
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Bmp")]
     public class BmpEncoderTests
     {
         public static readonly TheoryData<BmpBitsPerPixel> BitsPerPixel =
-        new TheoryData<BmpBitsPerPixel>
+        new()
         {
             BmpBitsPerPixel.Pixel24,
             BmpBitsPerPixel.Pixel32
         };
 
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
-        new TheoryData<string, int, int, PixelResolutionUnit>
+        new()
         {
             { Car, 3780, 3780, PixelResolutionUnit.PixelsPerMeter },
             { V5Header, 3780, 3780, PixelResolutionUnit.PixelsPerMeter },
             { RLE8, 2835, 2835, PixelResolutionUnit.PixelsPerMeter }
         };
 
         public static readonly TheoryData<string, BmpBitsPerPixel> BmpBitsPerPixelFiles =
-        new TheoryData<string, BmpBitsPerPixel>
+        new()
         {
             { Bit1, BmpBitsPerPixel.Pixel1 },
             { Bit4, BmpBitsPerPixel.Pixel4 },

diff --git a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
@@ -8,15 +8,13 @@
 using System.Reflection;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors.Quantization;
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats
 {
-    [Collection("RunSerial")]
     public class GeneralFormatTests
     {
         /// <summary>
@@ -34,7 +32,7 @@ public class GeneralFormatTests
         /// <summary>
         /// The collection of image files to test against.
         /// </summary>
-        protected static readonly List<TestFile> Files = new List<TestFile>
+        protected static readonly List<TestFile> Files = new()
         {
             TestFile.Create(TestImages.Jpeg.Baseline.Calliphora),
             TestFile.Create(TestImages.Bmp.Car),
@@ -85,8 +83,8 @@ public void DecodeThenEncodeImageFromStreamShouldSucceed()
         }
 
         public static readonly TheoryData<string> QuantizerNames =
-            new TheoryData<string>
-                {
+            new()
+            {
                     nameof(KnownQuantizers.Octree),
                     nameof(KnownQuantizers.WebSafe),
                     nameof(KnownQuantizers.Werner),

diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
@@ -17,13 +17,12 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Gif
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Gif")]
     public class GifDecoderTests
     {
         private const PixelTypes TestPixelTypes = PixelTypes.Rgba32 | PixelTypes.RgbaVector | PixelTypes.Argb32;
 
-        private static GifDecoder GifDecoder => new GifDecoder();
+        private static GifDecoder GifDecoder => new();
 
         public static readonly string[] MultiFrameTestFiles =
         {

diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
@@ -13,15 +13,14 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Gif
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Gif")]
     public class GifEncoderTests
     {
         private const PixelTypes TestPixelTypes = PixelTypes.Rgba32 | PixelTypes.RgbaVector | PixelTypes.Argb32;
         private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.0015F);
 
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
-        new TheoryData<string, int, int, PixelResolutionUnit>
+        new()
         {
             { TestImages.Gif.Rings, (int)ImageMetadata.DefaultHorizontalResolution, (int)ImageMetadata.DefaultVerticalResolution, PixelResolutionUnit.PixelsPerInch },
             { TestImages.Gif.Ratio1x4, 1, 4, PixelResolutionUnit.AspectRatio },

diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs
@@ -12,20 +12,19 @@
 
 namespace SixLabors.ImageSharp.Tests.Formats.Gif
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Gif")]
     public class GifMetadataTests
     {
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
-            new TheoryData<string, int, int, PixelResolutionUnit>
+            new()
             {
                 { TestImages.Gif.Rings, (int)ImageMetadata.DefaultHorizontalResolution, (int)ImageMetadata.DefaultVerticalResolution, PixelResolutionUnit.PixelsPerInch },
                 { TestImages.Gif.Ratio1x4, 1, 4, PixelResolutionUnit.AspectRatio },
                 { TestImages.Gif.Ratio4x1, 4, 1, PixelResolutionUnit.AspectRatio }
             };
 
         public static readonly TheoryData<string, uint> RepeatFiles =
-            new TheoryData<string, uint>
+            new()
             {
                 { TestImages.Gif.Cheers, 0 },
                 { TestImages.Gif.Receipt, 1 },

diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -21,8 +21,7 @@
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 {
     // TODO: Scatter test cases into multiple test classes
-    [Collection("RunSerial")]
-    [Trait("Format", "Jpg")]
+     [Trait("Format", "Jpg")]
     public partial class JpegDecoderTests
     {
         public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Argb32 | PixelTypes.Bgr24 | PixelTypes.RgbaVector;

diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
@@ -19,23 +19,22 @@
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Jpg")]
     public class JpegEncoderTests
     {
-        private static JpegEncoder JpegEncoder => new JpegEncoder();
+        private static JpegEncoder JpegEncoder => new();
 
-        private static JpegDecoder JpegDecoder => new JpegDecoder();
+        private static JpegDecoder JpegDecoder => new();
 
         public static readonly TheoryData<string, int> QualityFiles =
-            new TheoryData<string, int>
+            new()
             {
                 { TestImages.Jpeg.Baseline.Calliphora, 80 },
                 { TestImages.Jpeg.Progressive.Fb, 75 }
             };
 
         public static readonly TheoryData<JpegColorType, int> BitsPerPixel_Quality =
-            new TheoryData<JpegColorType, int>
+            new()
             {
                 { JpegColorType.YCbCrRatio420, 40 },
                 { JpegColorType.YCbCrRatio420, 60 },
@@ -49,15 +48,15 @@ public class JpegEncoderTests
             };
 
         public static readonly TheoryData<int> Grayscale_Quality =
-            new TheoryData<int>
+            new()
             {
                 { 40 },
                 { 60 },
                 { 100 }
             };
 
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
-            new TheoryData<string, int, int, PixelResolutionUnit>
+            new()
             {
                 { TestImages.Jpeg.Baseline.Ratio1x1, 1, 1, PixelResolutionUnit.AspectRatio },
                 { TestImages.Jpeg.Baseline.Snake, 300, 300, PixelResolutionUnit.PixelsPerInch },

diff --git a/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
@@ -16,13 +16,12 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Png
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Png")]
     public partial class PngDecoderTests
     {
         private const PixelTypes PixelTypes = Tests.PixelTypes.Rgba32 | Tests.PixelTypes.RgbaVector | Tests.PixelTypes.Argb32;
 
-        private static PngDecoder PngDecoder => new PngDecoder();
+        private static PngDecoder PngDecoder => new();
 
         public static readonly string[] CommonTestImages =
         {

diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -15,21 +15,20 @@
 
 namespace SixLabors.ImageSharp.Tests.Formats.Png
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Png")]
     public partial class PngEncoderTests
     {
-        private static PngEncoder PngEncoder => new PngEncoder();
+        private static PngEncoder PngEncoder => new();
 
         public static readonly TheoryData<string, PngBitDepth> PngBitDepthFiles =
-        new TheoryData<string, PngBitDepth>
+        new()
         {
             { TestImages.Png.Rgb48Bpp, PngBitDepth.Bit16 },
             { TestImages.Png.Bpp1, PngBitDepth.Bit1 }
         };
 
         public static readonly TheoryData<string, PngBitDepth, PngColorType> PngTrnsFiles =
-        new TheoryData<string, PngBitDepth, PngColorType>
+        new()
         {
             { TestImages.Png.Gray1BitTrans, PngBitDepth.Bit1, PngColorType.Grayscale },
             { TestImages.Png.Gray2BitTrans, PngBitDepth.Bit2, PngColorType.Grayscale },
@@ -43,15 +42,15 @@ public partial class PngEncoderTests
         /// <summary>
         /// All types except Palette
         /// </summary>
-        public static readonly TheoryData<PngColorType> PngColorTypes = new TheoryData<PngColorType>
+        public static readonly TheoryData<PngColorType> PngColorTypes = new()
         {
             PngColorType.RgbWithAlpha,
             PngColorType.Rgb,
             PngColorType.Grayscale,
             PngColorType.GrayscaleWithAlpha,
         };
 
-        public static readonly TheoryData<PngFilterMethod> PngFilterMethods = new TheoryData<PngFilterMethod>
+        public static readonly TheoryData<PngFilterMethod> PngFilterMethods = new()
         {
             PngFilterMethod.None,
             PngFilterMethod.Sub,
@@ -65,7 +64,7 @@ public partial class PngEncoderTests
         /// All types except Palette
         /// </summary>
         public static readonly TheoryData<PngCompressionLevel> CompressionLevels
-        = new TheoryData<PngCompressionLevel>
+        = new()
         {
             PngCompressionLevel.Level0,
             PngCompressionLevel.Level1,
@@ -79,12 +78,12 @@ public static readonly TheoryData<PngCompressionLevel> CompressionLevels
             PngCompressionLevel.Level9,
         };
 
-        public static readonly TheoryData<int> PaletteSizes = new TheoryData<int>
+        public static readonly TheoryData<int> PaletteSizes = new()
         {
             30, 55, 100, 201, 255
         };
 
-        public static readonly TheoryData<int> PaletteLargeOnly = new TheoryData<int>
+        public static readonly TheoryData<int> PaletteLargeOnly = new()
         {
             80, 100, 120, 230
         };
@@ -96,7 +95,7 @@ public static readonly TheoryData<PngCompressionLevel> CompressionLevels
         };
 
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
-        new TheoryData<string, int, int, PixelResolutionUnit>
+        new()
         {
             { TestImages.Png.Splash, 11810, 11810, PixelResolutionUnit.PixelsPerMeter },
             { TestImages.Png.Ratio1x4, 1, 4, PixelResolutionUnit.AspectRatio },

diff --git a/tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs
@@ -15,11 +15,10 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Tga
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Tga")]
     public class TgaDecoderTests
     {
-        private static TgaDecoder TgaDecoder => new TgaDecoder();
+        private static TgaDecoder TgaDecoder => new();
 
         [Theory]
         [WithFile(Gray8BitTopLeft, PixelTypes.Rgba32)]

diff --git a/tests/ImageSharp.Tests/Formats/Tga/TgaEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Tga/TgaEncoderTests.cs
@@ -11,19 +11,18 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Tga
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Tga")]
     public class TgaEncoderTests
     {
         public static readonly TheoryData<TgaBitsPerPixel> BitsPerPixel =
-            new TheoryData<TgaBitsPerPixel>
+            new()
             {
                 TgaBitsPerPixel.Pixel24,
                 TgaBitsPerPixel.Pixel32
             };
 
         public static readonly TheoryData<string, TgaBitsPerPixel> TgaBitsPerPixelFiles =
-            new TheoryData<string, TgaBitsPerPixel>
+            new()
             {
                 { Gray8BitBottomLeft, TgaBitsPerPixel.Pixel8 },
                 { Bit16BottomLeft, TgaBitsPerPixel.Pixel16 },

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
@@ -15,15 +15,14 @@
 
 namespace SixLabors.ImageSharp.Tests.Formats.Tiff
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Tiff")]
     public class TiffDecoderTests
     {
         public static readonly string[] MultiframeTestImages = Multiframes;
 
-        private static TiffDecoder TiffDecoder => new TiffDecoder();
+        private static TiffDecoder TiffDecoder => new();
 
-        private static MagickReferenceDecoder ReferenceDecoder => new MagickReferenceDecoder();
+        private static MagickReferenceDecoder ReferenceDecoder => new();
 
         [Theory]
         [WithFile(RgbUncompressedTiled, PixelTypes.Rgba32)]

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs
@@ -11,7 +11,6 @@
 
 namespace SixLabors.ImageSharp.Tests.Formats.Tiff
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Tiff")]
     public class TiffEncoderTests : TiffEncoderBaseTester
     {

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
@@ -17,11 +17,10 @@
 
 namespace SixLabors.ImageSharp.Tests.Formats.Tiff
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Tiff")]
     public class TiffMetadataTests
     {
-        private static TiffDecoder TiffDecoder => new TiffDecoder();
+        private static TiffDecoder TiffDecoder => new();
 
         private class NumberComparer : IEqualityComparer<Number>
         {

diff --git a/tests/ImageSharp.Tests/Formats/WebP/WebpDecoderTests.cs b/tests/ImageSharp.Tests/Formats/WebP/WebpDecoderTests.cs
@@ -12,7 +12,6 @@
 // ReSharper disable InconsistentNaming
 namespace SixLabors.ImageSharp.Tests.Formats.Webp
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Webp")]
     public class WebpDecoderTests
     {

diff --git a/tests/ImageSharp.Tests/Formats/WebP/WebpEncoderTests.cs b/tests/ImageSharp.Tests/Formats/WebP/WebpEncoderTests.cs
@@ -11,7 +11,6 @@
 
 namespace SixLabors.ImageSharp.Tests.Formats.Webp
 {
-    [Collection("RunSerial")]
     [Trait("Format", "Webp")]
     public class WebpEncoderTests
     {

diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedPoolMemoryAllocatorTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -310,6 +310,7 @@ private static void AllocateGroupAndForget(UniformUnmanagedMemoryPoolMemoryAlloc
             }
         }
 
+        [ActiveIssue("https://github.com/SixLabors/ImageSharp/issues/1887", TestPlatforms.OSX)]
         [Theory]
         [InlineData(300)] // Group of single SharedArrayPoolBuffer<T>
         [InlineData(600)] // Group of single UniformUnmanagedMemoryPool buffer