Skip to content

Commit 5ab768c

Browse files
brianpopowbrianpopow
authored
Merge pull request #1455 from SixLabors/bp/xunittraits
Add xunit trait attributes to tests
2 parents 14c541c + 455088e commit 5ab768c

File tree

83 files changed

+125
-44
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+125
-44
lines changed

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@
77

88
using SixLabors.ImageSharp.Formats.Bmp;
99
using SixLabors.ImageSharp.Memory;
10+
using SixLabors.ImageSharp.Metadata;
1011
using SixLabors.ImageSharp.PixelFormats;
1112
using SixLabors.ImageSharp.Tests.TestUtilities;
1213
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
1314
using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs;
1415

1516
using Xunit;
1617

18+
using static SixLabors.ImageSharp.Tests.TestImages.Bmp;
19+
1720
// ReSharper disable InconsistentNaming
1821
namespace SixLabors.ImageSharp.Tests.Formats.Bmp
1922
{
20-
using SixLabors.ImageSharp.Metadata;
21-
using static TestImages.Bmp;
22-
23+
[Trait("Format", "Bmp")]
2324
public class BmpDecoderTests
2425
{
2526
public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.RgbaVector;

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
using SixLabors.ImageSharp.Processing.Processors.Quantization;
1212
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
1313
using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs;
14+
1415
using Xunit;
1516
using Xunit.Abstractions;
1617

18+
using static SixLabors.ImageSharp.Tests.TestImages.Bmp;
19+
1720
// ReSharper disable InconsistentNaming
1821
namespace SixLabors.ImageSharp.Tests.Formats.Bmp
1922
{
20-
using static TestImages.Bmp;
21-
23+
[Trait("Format", "Bmp")]
2224
public class BmpEncoderTests
2325
{
2426
public static readonly TheoryData<BmpBitsPerPixel> BitsPerPixel =

‎tests/ImageSharp.Tests/Formats/Bmp/BmpFileHeaderTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace SixLabors.ImageSharp.Tests.Formats.Bmp
99
{
10+
[Trait("Format", "Bmp")]
1011
public class BmpFileHeaderTests
1112
{
1213
[Fact]

‎tests/ImageSharp.Tests/Formats/Bmp/BmpMetadataTests.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
using System.IO;
55

66
using SixLabors.ImageSharp.Formats.Bmp;
7+
78
using Xunit;
89

10+
using static SixLabors.ImageSharp.Tests.TestImages.Bmp;
11+
912
// ReSharper disable InconsistentNaming
1013
namespace SixLabors.ImageSharp.Tests.Formats.Bmp
1114
{
12-
using static TestImages.Bmp;
13-
15+
[Trait("Format", "Bmp")]
1416
public class BmpMetadataTests
1517
{
1618
[Fact]

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

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
// ReSharper disable InconsistentNaming
1818
namespace SixLabors.ImageSharp.Tests.Formats.Gif
1919
{
20+
[Trait("Format", "Gif")]
2021
public class GifDecoderTests
2122
{
2223
private const PixelTypes TestPixelTypes = PixelTypes.Rgba32 | PixelTypes.RgbaVector | PixelTypes.Argb32;

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
// Licensed under the Apache License, Version 2.0.
33

44
using System.IO;
5-
using SixLabors.ImageSharp.Formats;
5+
66
using SixLabors.ImageSharp.Formats.Gif;
77
using SixLabors.ImageSharp.Metadata;
88
using SixLabors.ImageSharp.PixelFormats;
99
using SixLabors.ImageSharp.Processing.Processors.Quantization;
1010
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
11+
1112
using Xunit;
1213

1314
// ReSharper disable InconsistentNaming
1415
namespace SixLabors.ImageSharp.Tests.Formats.Gif
1516
{
17+
[Trait("Format", "Gif")]
1618
public class GifEncoderTests
1719
{
1820
private const PixelTypes TestPixelTypes = PixelTypes.Rgba32 | PixelTypes.RgbaVector | PixelTypes.Argb32;

‎tests/ImageSharp.Tests/Formats/Gif/GifFrameMetadataTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace SixLabors.ImageSharp.Tests.Formats.Gif
88
{
9+
[Trait("Format", "Gif")]
910
public class GifFrameMetadataTests
1011
{
1112
[Fact]

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

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace SixLabors.ImageSharp.Tests.Formats.Gif
1515
{
16+
[Trait("Format", "Gif")]
1617
public class GifMetadataTests
1718
{
1819
public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =

‎tests/ImageSharp.Tests/Formats/Jpg/AdobeMarkerTests.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Six Labors.
1+
// Copyright (c) Six Labors.
22
// Licensed under the Apache License, Version 2.0.
33

44
using SixLabors.ImageSharp.Formats.Jpeg;
@@ -8,6 +8,7 @@
88

99
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1010
{
11+
[Trait("Format", "Jpg")]
1112
public class AdobeMarkerTests
1213
{
1314
// Taken from actual test image
@@ -79,4 +80,4 @@ public void MarkerHashCodeIsUnique()
7980
Assert.False(marker.GetHashCode().Equals(marker2.GetHashCode()));
8081
}
8182
}
82-
}
83+
}

‎tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.CopyToBufferArea.cs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ReSharper disable InconsistentNaming
1414
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1515
{
16+
[Trait("Format", "Jpg")]
1617
public partial class Block8x8FTests
1718
{
1819
public class CopyToBufferArea : JpegFixture

‎tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1616
{
17+
[Trait("Format", "Jpg")]
1718
public partial class Block8x8FTests : JpegFixture
1819
{
1920
#if BENCHMARKING

‎tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1111
{
12+
[Trait("Format", "Jpg")]
1213
public class Block8x8Tests : JpegFixture
1314
{
1415
public Block8x8Tests(ITestOutputHelper output)

‎tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// ReSharper disable InconsistentNaming
1313
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1414
{
15+
[Trait("Format", "Jpg")]
1516
public static class DCTTests
1617
{
1718
public class FastFloatingPoint : JpegFixture

‎tests/ImageSharp.Tests/Formats/Jpg/GenericBlock8x8Tests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1313
{
14+
[Trait("Format", "Jpg")]
1415
public class GenericBlock8x8Tests
1516
{
1617
public static Image<TPixel> CreateTestImage<TPixel>()

‎tests/ImageSharp.Tests/Formats/Jpg/ImageExtensionsTest.cs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1212
{
13+
[Trait("Format", "Jpg")]
1314
public class ImageExtensionsTest
1415
{
1516
[Fact]

‎tests/ImageSharp.Tests/Formats/Jpg/JFifMarkerTests.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Six Labors.
1+
// Copyright (c) Six Labors.
22
// Licensed under the Apache License, Version 2.0.
33

44
using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder;
@@ -7,6 +7,7 @@
77

88
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
99
{
10+
[Trait("Format", "Jpg")]
1011
public class JFifMarkerTests
1112
{
1213
// Taken from actual test image
@@ -91,4 +92,4 @@ public void MarkerHashCodeIsUnique()
9192
Assert.False(marker.GetHashCode().Equals(marker2.GetHashCode()));
9293
}
9394
}
94-
}
95+
}

‎tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1818
{
19+
[Trait("Format", "Jpg")]
1920
public class JpegColorConverterTests
2021
{
2122
private const float Precision = 0.1F / 255;

‎tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Baseline.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Apache License, Version 2.0.
33

4-
using Microsoft.DotNet.RemoteExecutor;
5-
using SixLabors.ImageSharp.Memory;
64
using SixLabors.ImageSharp.PixelFormats;
75
using SixLabors.ImageSharp.Tests.TestUtilities;
8-
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
6+
97
using Xunit;
108

119
// ReSharper disable InconsistentNaming
1210
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1311
{
12+
[Trait("Format", "Jpg")]
1413
public partial class JpegDecoderTests
1514
{
1615
[Theory]

‎tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Images.cs

+2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
// Licensed under the Apache License, Version 2.0.
33

44
using System.Collections.Generic;
5+
using Xunit;
56

67
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
78
{
9+
[Trait("Format", "Jpg")]
810
public partial class JpegDecoderTests
911
{
1012
public static string[] BaselineTestJpegs =

‎tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Apache License, Version 2.0.
33

4+
using System;
45
using System.IO;
6+
using System.Runtime.CompilerServices;
7+
58
using SixLabors.ImageSharp.Formats;
9+
using SixLabors.ImageSharp.Formats.Jpeg;
10+
using SixLabors.ImageSharp.Metadata;
611
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
712
using SixLabors.ImageSharp.Metadata.Profiles.Icc;
813
using SixLabors.ImageSharp.PixelFormats;
14+
915
using Xunit;
1016

1117
// ReSharper disable InconsistentNaming
1218
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1319
{
14-
using System;
15-
using System.Runtime.CompilerServices;
16-
17-
using SixLabors.ImageSharp.Formats.Jpeg;
18-
using SixLabors.ImageSharp.Metadata;
19-
20+
[Trait("Format", "Jpg")]
2021
public partial class JpegDecoderTests
2122
{
2223
// TODO: A JPEGsnoop & metadata expert should review if the Exif/Icc expectations are correct.

‎tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// ReSharper disable InconsistentNaming
1010
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1111
{
12+
[Trait("Format", "Jpg")]
1213
public partial class JpegDecoderTests
1314
{
1415
public const string DecodeProgressiveJpegOutputName = "DecodeProgressiveJpeg";

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
using System.Linq;
77
using System.Threading;
88
using System.Threading.Tasks;
9-
using Microsoft.DotNet.RemoteExecutor;
9+
1010
using SixLabors.ImageSharp.Formats.Jpeg;
1111
using SixLabors.ImageSharp.IO;
1212
using SixLabors.ImageSharp.Memory;
1313
using SixLabors.ImageSharp.PixelFormats;
1414
using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils;
15-
using SixLabors.ImageSharp.Tests.TestUtilities;
1615
using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison;
1716

1817
using Xunit;
@@ -22,6 +21,7 @@
2221
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
2322
{
2423
// TODO: Scatter test cases into multiple test classes
24+
[Trait("Format", "Jpg")]
2525
public partial class JpegDecoderTests
2626
{
2727
public const PixelTypes CommonNonDefaultPixelTypes = PixelTypes.Rgba32 | PixelTypes.Argb32 | PixelTypes.RgbaVector;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// Copyright (c) Six Labors.
22
// Licensed under the Apache License, Version 2.0.
33

4-
using System;
54
using System.Collections.Generic;
65
using System.IO;
76
using System.Threading;
87
using System.Threading.Tasks;
8+
99
using SixLabors.ImageSharp.Formats.Jpeg;
10-
using SixLabors.ImageSharp.Memory;
1110
using SixLabors.ImageSharp.Metadata;
1211
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
1312
using SixLabors.ImageSharp.Metadata.Profiles.Icc;
@@ -20,6 +19,7 @@
2019

2120
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
2221
{
22+
[Trait("Format", "Jpg")]
2323
public class JpegEncoderTests
2424
{
2525
public static readonly TheoryData<string, int> QualityFiles =

‎tests/ImageSharp.Tests/Formats/Jpg/JpegFileMarkerTests.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Six Labors.
1+
// Copyright (c) Six Labors.
22
// Licensed under the Apache License, Version 2.0.
33

44
using SixLabors.ImageSharp.Formats.Jpeg;
@@ -7,6 +7,7 @@
77

88
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
99
{
10+
[Trait("Format", "Jpg")]
1011
public class JpegFileMarkerTests
1112
{
1213
[Fact]

‎tests/ImageSharp.Tests/Formats/Jpg/JpegImagePostProcessorTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1414
{
15+
[Trait("Format", "Jpg")]
1516
public class JpegImagePostProcessorTests
1617
{
1718
public static string[] BaselineTestJpegs =

‎tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
88
{
9+
[Trait("Format", "Jpg")]
910
public class JpegMetadataTests
1011
{
1112
[Fact]

‎tests/ImageSharp.Tests/Formats/Jpg/LibJpegToolsTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1212
{
13+
[Trait("Format", "Jpg")]
1314
public class LibJpegToolsTests
1415
{
1516
[Fact]

‎tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1515
{
16+
[Trait("Format", "Jpg")]
1617
public class ParseStreamTests
1718
{
1819
private ITestOutputHelper Output { get; }

‎tests/ImageSharp.Tests/Formats/Jpg/ProfileResolverTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1111
{
12+
[Trait("Format", "Jpg")]
1213
public class ProfileResolverTests
1314
{
1415
private static readonly byte[] JFifMarker = Encoding.ASCII.GetBytes("JFIF\0");

‎tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.AccurateDCT.cs

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1111
{
12+
[Trait("Format", "Jpg")]
1213
public partial class ReferenceImplementationsTests
1314
{
1415
public class AccurateDCT : JpegFixture

‎tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.FastFloatingPointDCT.cs

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
namespace SixLabors.ImageSharp.Tests.Formats.Jpg
1212
{
13+
[Trait("Format", "Jpg")]
1314
public partial class ReferenceImplementationsTests
1415
{
1516
public class FastFloatingPointDCT : JpegFixture

0 commit comments

Comments
 (0)