Browse Source

Remove RunSerial from tests

pull/1885/head
Brian Popow 4 years ago
parent
commit
dd051e2248
  1. 1
      tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs
  2. 7
      tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs
  3. 8
      tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
  4. 3
      tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs
  5. 3
      tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
  6. 5
      tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs
  7. 3
      tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
  8. 13
      tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
  9. 3
      tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs
  10. 19
      tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
  11. 3
      tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs
  12. 5
      tests/ImageSharp.Tests/Formats/Tga/TgaEncoderTests.cs
  13. 5
      tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs
  14. 1
      tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs
  15. 3
      tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs
  16. 1
      tests/ImageSharp.Tests/Formats/WebP/WebpDecoderTests.cs
  17. 1
      tests/ImageSharp.Tests/Formats/WebP/WebpEncoderTests.cs

1
tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs

@ -19,7 +19,6 @@ using static SixLabors.ImageSharp.Tests.TestImages.Bmp;
// ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Bmp
{
[Collection("RunSerial")]
[Trait("Format", "Bmp")]
public class BmpDecoderTests
{

7
tests/ImageSharp.Tests/Formats/Bmp/BmpEncoderTests.cs

@ -17,19 +17,18 @@ using static SixLabors.ImageSharp.Tests.TestImages.Bmp;
// 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 },
@ -37,7 +36,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
};
public static readonly TheoryData<string, BmpBitsPerPixel> BmpBitsPerPixelFiles =
new TheoryData<string, BmpBitsPerPixel>
new()
{
{ Bit1, BmpBitsPerPixel.Pixel1 },
{ Bit4, BmpBitsPerPixel.Pixel4 },

8
tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs

@ -8,7 +8,6 @@ using System.Linq;
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;
@ -16,7 +15,6 @@ using Xunit;
namespace SixLabors.ImageSharp.Tests.Formats
{
[Collection("RunSerial")]
public class GeneralFormatTests
{
/// <summary>
@ -34,7 +32,7 @@ namespace SixLabors.ImageSharp.Tests.Formats
/// <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 @@ namespace SixLabors.ImageSharp.Tests.Formats
}
public static readonly TheoryData<string> QuantizerNames =
new TheoryData<string>
{
new()
{
nameof(KnownQuantizers.Octree),
nameof(KnownQuantizers.WebSafe),
nameof(KnownQuantizers.Werner),

3
tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs

@ -17,13 +17,12 @@ using Xunit;
// 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 =
{

3
tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs

@ -13,7 +13,6 @@ using Xunit;
// ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Gif
{
[Collection("RunSerial")]
[Trait("Format", "Gif")]
public class GifEncoderTests
{
@ -21,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
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 },

5
tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs

@ -12,12 +12,11 @@ using Xunit;
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 },
@ -25,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
};
public static readonly TheoryData<string, uint> RepeatFiles =
new TheoryData<string, uint>
new()
{
{ TestImages.Gif.Cheers, 0 },
{ TestImages.Gif.Receipt, 1 },

3
tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs

@ -21,8 +21,7 @@ using Xunit.Abstractions;
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;

13
tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs

@ -19,23 +19,22 @@ using Xunit;
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,7 +48,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
};
public static readonly TheoryData<int> Grayscale_Quality =
new TheoryData<int>
new()
{
{ 40 },
{ 60 },
@ -57,7 +56,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
};
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 },

3
tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs

@ -16,13 +16,12 @@ using Xunit;
// 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 =
{

19
tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@ -15,21 +15,20 @@ using Xunit;
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,7 +42,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
/// <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,
@ -51,7 +50,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
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 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
/// All types except Palette
/// </summary>
public static readonly TheoryData<PngCompressionLevel> CompressionLevels
= new TheoryData<PngCompressionLevel>
= new()
{
PngCompressionLevel.Level0,
PngCompressionLevel.Level1,
@ -79,12 +78,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
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 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
};
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 },

3
tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs

@ -15,11 +15,10 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tga;
// 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)]

5
tests/ImageSharp.Tests/Formats/Tga/TgaEncoderTests.cs

@ -11,19 +11,18 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tga;
// 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 },

5
tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderTests.cs

@ -15,15 +15,14 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tiff;
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)]

1
tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderTests.cs

@ -11,7 +11,6 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tiff;
namespace SixLabors.ImageSharp.Tests.Formats.Tiff
{
[Collection("RunSerial")]
[Trait("Format", "Tiff")]
public class TiffEncoderTests : TiffEncoderBaseTester
{

3
tests/ImageSharp.Tests/Formats/Tiff/TiffMetadataTests.cs

@ -16,11 +16,10 @@ using static SixLabors.ImageSharp.Tests.TestImages.Tiff;
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();
[Fact]
public void TiffMetadata_CloneIsDeep()

1
tests/ImageSharp.Tests/Formats/WebP/WebpDecoderTests.cs

@ -12,7 +12,6 @@ using static SixLabors.ImageSharp.Tests.TestImages.Webp;
// ReSharper disable InconsistentNaming
namespace SixLabors.ImageSharp.Tests.Formats.Webp
{
[Collection("RunSerial")]
[Trait("Format", "Webp")]
public class WebpDecoderTests
{

1
tests/ImageSharp.Tests/Formats/WebP/WebpEncoderTests.cs

@ -11,7 +11,6 @@ using static SixLabors.ImageSharp.Tests.TestImages.Webp;
namespace SixLabors.ImageSharp.Tests.Formats.Webp
{
[Collection("RunSerial")]
[Trait("Format", "Webp")]
public class WebpEncoderTests
{

Loading…
Cancel
Save