SixLabors#12 Mark tiff tests with "Tiff" category, cleanup test classes

IldarKhayrutdinov · Aug 11, 2019 · 9be4966 · 9be4966
1 parent 77af83e
commit 9be4966
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 88 deletions.
diff --git a/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/BlackIsZeroTiffColorTests.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Collections.Generic;
+using SixLabors.ImageSharp.Formats.Tiff;
 using SixLabors.ImageSharp.PixelFormats;
+using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using System.Collections.Generic;
-    using Xunit;
-
-    using ImageSharp.Formats.Tiff;
-
+    [Trait("Category", "Tiff")]
     public class BlackIsZeroTiffColorTests : PhotometricInterpretationTestBase
     {
         private static Rgba32 Gray000 = new Rgba32(0, 0, 0, 255);

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/PaletteTiffColorTests.cs
@@ -10,6 +10,7 @@ namespace SixLabors.ImageSharp.Tests
 
     using ImageSharp.Formats.Tiff;
 
+    [Trait("Category", "Tiff")]
     public class PaletteTiffColorTests : PhotometricInterpretationTestBase
     {
         public static uint[][] Palette4_ColorPalette { get => GeneratePalette(16); }

diff --git a/...geSharp.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs b/...geSharp.Tests/Formats/Tiff/PhotometricInterpretation/PhotometricInterpretationTestBase.cs
@@ -11,6 +11,7 @@ namespace SixLabors.ImageSharp.Tests
     using ImageSharp;
     using SixLabors.ImageSharp.Memory;
 
+    [Trait("Category", "Tiff")]
     public abstract class PhotometricInterpretationTestBase
     {
         public static Rgba32 DefaultColor = new Rgba32(42, 96, 18, 128);

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbPlanarTiffColorTests.cs
@@ -10,6 +10,7 @@ namespace SixLabors.ImageSharp.Tests
 
     using ImageSharp.Formats.Tiff;
 
+    [Trait("Category", "Tiff")]
     public class RgbPlanarTiffColorTests : PhotometricInterpretationTestBase
     {
         private static Rgba32 Rgb4_000 = new Rgba32(0, 0, 0, 255);

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/RgbTiffColorTests.cs
@@ -10,6 +10,7 @@ namespace SixLabors.ImageSharp.Tests
 
     using ImageSharp.Formats.Tiff;
 
+    [Trait("Category", "Tiff")]
     public class RgbTiffColorTests : PhotometricInterpretationTestBase
     {
         private static Rgba32 Rgb4_000 = new Rgba32(0, 0, 0, 255);

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/PhotometricInterpretation/WhiteIsZeroTiffColorTests.cs
@@ -10,6 +10,7 @@ namespace SixLabors.ImageSharp.Tests
 
     using ImageSharp.Formats.Tiff;
 
+    [Trait("Category", "Tiff")]
     public class WhiteIsZeroTiffColorTests : PhotometricInterpretationTestBase
     {
         private static Rgba32 Gray000 = new Rgba32(255, 255, 255, 255);

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderHeaderTests.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.IO;
+using SixLabors.ImageSharp.Formats.Tiff;
 using SixLabors.ImageSharp.PixelFormats;
+using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using System.IO;
-    using Xunit;
-
-    using ImageSharp.Formats;
-
+    [Trait("Category", "Tiff")]
     public class TiffDecoderHeaderTests
     {
         public static object[][] IsLittleEndianValues = new[] { new object[] { false },

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdEntryTests.cs
@@ -1,19 +1,16 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
+using System.IO;
+using System.Linq;
+using SixLabors.ImageSharp.Formats.Tiff;
+using SixLabors.ImageSharp.Primitives;
+using Xunit;
+
 namespace SixLabors.ImageSharp.Tests
 {
-    using System;
-    using System.IO;
-    using System.Linq;
-    using Xunit;
-
-    using ImageSharp.Formats;
-    using ImageSharp.Formats.Tiff;
-
-    using SixLabors.ImageSharp.MetaData.Profiles.Exif;
-    using SixLabors.ImageSharp.Primitives;
-
+    [Trait("Category", "Tiff")]
     public class TiffDecoderIfdEntryTests
     {
         [Theory]
@@ -88,9 +85,11 @@ public void ReadBytes_ReturnsExpectedData(ushort type, uint count, byte[] bytes,
             (TiffDecoderCore decoder, TiffIfdEntry entry) = GenerateTestIfdEntry(TiffGenEntry.Bytes(TiffTags.ImageWidth, (TiffType)type, count, bytes), isLittleEndian);
 
             byte[] result = decoder.ReadBytes(ref entry);
-            
+
             if (bytes.Length < 4)
+            {
                 result = result.Take(bytes.Length).ToArray();
+            }
 
             Assert.Equal(bytes, result);
         }
@@ -113,7 +112,7 @@ public void ReadBytes_CachesDataLongerThanFourBytes(ushort type, uint count, byt
             Assert.Equal(4, entry.Value.Length);
 
             byte[] result = decoder.ReadBytes(ref entry);
-            
+
             Assert.Equal(bytes.Length, entry.Value.Length);
             Assert.Equal(bytes, entry.Value);
         }
@@ -154,7 +153,7 @@ public void ReadUnsignedInteger_ReturnsValue(ushort type, bool isLittleEndian, b
             (TiffDecoderCore decoder, TiffIfdEntry entry) = GenerateTestIfdEntry(TiffGenEntry.Bytes(TiffTags.ImageWidth, (TiffType)type, 1, bytes), isLittleEndian);
 
             uint result = decoder.ReadUnsignedInteger(ref entry);
-            
+
             Assert.Equal(expectedValue, result);
         }
 
@@ -231,7 +230,7 @@ public void ReadSignedInteger_ReturnsValue(ushort type, bool isLittleEndian, byt
             (TiffDecoderCore decoder, TiffIfdEntry entry) = GenerateTestIfdEntry(TiffGenEntry.Bytes(TiffTags.ImageWidth, (TiffType)type, 1, bytes), isLittleEndian);
 
             int result = decoder.ReadSignedInteger(ref entry);
-            
+
             Assert.Equal(expectedValue, result);
         }
 
@@ -294,7 +293,7 @@ public void ReadUnsignedIntegerArray_ReturnsValue(ushort type, int count, bool i
             (TiffDecoderCore decoder, TiffIfdEntry entry) = GenerateTestIfdEntry(TiffGenEntry.Bytes(TiffTags.ImageWidth, (TiffType)type, (uint)expectedValue.Length, bytes), isLittleEndian);
 
             uint[] result = decoder.ReadUnsignedIntegerArray(ref entry);
-            
+
             Assert.Equal(expectedValue, result);
         }
 
@@ -341,7 +340,7 @@ public void ReadSignedIntegerArray_ReturnsValue(ushort type, int count, bool isL
             (TiffDecoderCore decoder, TiffIfdEntry entry) = GenerateTestIfdEntry(TiffGenEntry.Bytes(TiffTags.ImageWidth, (TiffType)type, (uint)expectedValue.Length, bytes), isLittleEndian);
 
             int[] result = decoder.ReadSignedIntegerArray(ref entry);
-            
+
             Assert.Equal(expectedValue, result);
         }
 
@@ -380,7 +379,7 @@ public void ReadString_ReturnsValue(bool isLittleEndian, byte[] bytes, string ex
             (TiffDecoderCore decoder, TiffIfdEntry entry) = GenerateTestIfdEntry(TiffGenEntry.Bytes(TiffTags.ImageWidth, TiffType.Ascii, (uint)bytes.Length, bytes), isLittleEndian);
 
             string result = decoder.ReadString(ref entry);
-            
+
             Assert.Equal(expectedValue, result);
         }
 
@@ -829,12 +828,12 @@ public void ReadDoubleArray_ThrowsExceptionIfInvalidType(ushort type)
         private (TiffDecoderCore, TiffIfdEntry) GenerateTestIfdEntry(TiffGenEntry entry, bool isLittleEndian)
         {
             Stream stream = new TiffGenIfd()
-                            {
-                                Entries =
+            {
+                Entries =
                                 {
                                     entry
                                 }
-                            }
+            }
                             .ToStream(isLittleEndian);
 
             TiffDecoderCore decoder = new TiffDecoderCore(stream, isLittleEndian, null, null);

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderIfdTests.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.IO;
+using SixLabors.ImageSharp.Formats.Tiff;
+using Xunit;
+
 namespace SixLabors.ImageSharp.Tests
 {
-    using System.IO;
-    using Xunit;
-
-    using ImageSharp.Formats;
-    using ImageSharp.Formats.Tiff;
-
+    [Trait("Category", "Tiff")]
     public class TiffDecoderIfdTests
     {
         public static object[][] IsLittleEndianValues = new[] { new object[] { false },

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderImageTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderImageTests.cs
@@ -1,17 +1,15 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
+using System.IO;
+using SixLabors.ImageSharp.Formats.Tiff;
 using SixLabors.ImageSharp.PixelFormats;
+using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using System;
-    using System.IO;
-    using Xunit;
-
-    using ImageSharp.Formats;
-    using ImageSharp.Formats.Tiff;
-
+    [Trait("Category", "Tiff")]
     public class TiffDecoderImageTests
     {
         public const int ImageWidth = 200;

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffDecoderMetadataTests.cs
@@ -1,17 +1,15 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.IO;
+using System.Linq;
+using SixLabors.ImageSharp.Formats.Tiff;
 using SixLabors.ImageSharp.PixelFormats;
+using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using System.IO;
-    using System.Linq;
-    using Xunit;
-
-    using ImageSharp.Formats;
-    using ImageSharp.Formats.Tiff;
-
+    [Trait("Category", "Tiff")]
     public class TiffDecoderMetadataTests
     {
         public static object[][] BaselineMetadataValues = new[] { new object[] { false, TiffTags.Artist, TiffMetadataNames.Artist, "My Artist Name" },

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderHeaderTests.cs
@@ -1,15 +1,13 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.IO;
+using SixLabors.ImageSharp.Formats.Tiff;
+using Xunit;
+
 namespace SixLabors.ImageSharp.Tests
 {
-    using System.IO;
-
-    using Xunit;
-
-    using ImageSharp.Formats;
-    using ImageSharp.Formats.Tiff;
-
+    [Trait("Category", "Tiff")]
     public class TiffEncoderHeaderTests
     {
         [Fact]

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderIfdTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderIfdTests.cs
@@ -1,18 +1,16 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using SixLabors.ImageSharp.Formats.Tiff;
+using Xunit;
+
 namespace SixLabors.ImageSharp.Tests
 {
-    using System;
-    using System.IO;
-    using System.Linq;
-    using Xunit;
-
-    using ImageSharp.Formats;
-    using ImageSharp.Formats.Tiff;
-
-    using System.Collections.Generic;
-
+    [Trait("Category", "Tiff")]
     public class TiffEncoderIfdTests
     {
         [Fact]

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffEncoderMetadataTests.cs
@@ -1,20 +1,16 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Collections.Generic;
+using SixLabors.ImageSharp.Formats.Tiff;
+using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
+using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
 {
-    using Xunit;
-
-    using ImageSharp.Formats;
-    using ImageSharp.Formats.Tiff;
-    using System.Collections.Generic;
-
-    using SixLabors.ImageSharp.MetaData;
-    using SixLabors.ImageSharp.MetaData.Profiles.Exif;
-    using SixLabors.ImageSharp.Primitives;
-
+    [Trait("Category", "Tiff")]
     public class TiffEncoderMetadataTests
     {
         public static object[][] BaselineMetadataValues = new[] { new object[] { TiffTags.Artist, TiffMetadataNames.Artist, "My Artist Name" },

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffFormatTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffFormatTests.cs
@@ -1,12 +1,12 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Formats.Tiff;
+using Xunit;
+
 namespace SixLabors.ImageSharp.Tests
 {
-    using Xunit;
-
-    using ImageSharp.Formats;
-
+    [Trait("Category", "Tiff")]
     public class TiffFormatTests
     {
         [Fact]

diff --git a/tests/ImageSharp.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs b/tests/ImageSharp.Tests/Formats/Tiff/TiffImageFormatDetectorTests.cs
@@ -1,13 +1,13 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System.Linq;
+using SixLabors.ImageSharp.Formats.Tiff;
+using Xunit;
+
 namespace SixLabors.ImageSharp.Tests
 {
-    using System.Linq;
-    using Xunit;
-
-    using ImageSharp.Formats;
-
+    [Trait("Category", "Tiff")]
     public class TiffImageFormatDetectorTests
     {
         public static object[][] IsLittleEndianValues = new[] { new object[] { false },