From 7a9357c1166d401377293d905c5a5a9e02d3269c Mon Sep 17 00:00:00 2001
From: Dmitry Pentin <riotbr3aker@gmail.com>
Date: Sat, 11 Dec 2021 09:36:51 +0300
Subject: [PATCH] Small qol fixes

---
 .../Formats/Jpg/JpegColorConverterTests.cs    | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
index a5414ba1d2..91f87610e2 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegColorConverterTests.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
     [Trait("Format", "Jpg")]
     public class JpegColorConverterTests
     {
-        private static readonly float MaxColorChannelValue = 255f;
+        private const float MaxColorChannelValue = 255f;
 
         private const float Precision = 0.1F / 255;
 
@@ -122,13 +122,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                     FeatureTestRunner.Deserialize<int>(arg));
         }
 
-#if SUPPORTS_RUNTIME_INTRINSICS
-        [Theory]
-        [MemberData(nameof(Seeds))]
-        public void FromYCbCrAvx2(int seed) =>
-            this.TestConverter(new JpegColorConverterBase.FromYCbCrAvx(8), 3, seed);
-#endif
-
         [Theory]
         [MemberData(nameof(Seeds))]
         public void FromCmykBasic(int seed) =>
@@ -159,13 +152,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                     FeatureTestRunner.Deserialize<int>(arg));
         }
 
-#if SUPPORTS_RUNTIME_INTRINSICS
-        [Theory]
-        [MemberData(nameof(Seeds))]
-        public void FromCmykAvx2(int seed) =>
-            this.TestConverter(new JpegColorConverterBase.FromCmykAvx(8), 4, seed);
-#endif
-
         [Theory]
         [MemberData(nameof(Seeds))]
         public void FromGrayscaleBasic(int seed) =>
@@ -196,13 +182,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                     FeatureTestRunner.Deserialize<int>(arg));
         }
 
-#if SUPPORTS_RUNTIME_INTRINSICS
-        [Theory]
-        [MemberData(nameof(Seeds))]
-        public void FromGrayscaleAvx2(int seed) =>
-            this.TestConverter(new JpegColorConverterBase.FromGrayscaleAvx(8), 1, seed);
-#endif
-
         [Theory]
         [MemberData(nameof(Seeds))]
         public void FromRgbBasic(int seed) =>
@@ -233,13 +212,6 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
                     FeatureTestRunner.Deserialize<int>(arg));
         }
 
-#if SUPPORTS_RUNTIME_INTRINSICS
-        [Theory]
-        [MemberData(nameof(Seeds))]
-        public void FromRgbAvx2(int seed) =>
-            this.TestConverter(new JpegColorConverterBase.FromRgbAvx(8), 3, seed);
-#endif
-
         [Theory]
         [MemberData(nameof(Seeds))]
         public void FromYccKBasic(int seed) =>
@@ -271,6 +243,26 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         }
 
 #if SUPPORTS_RUNTIME_INTRINSICS
+        [Theory]
+        [MemberData(nameof(Seeds))]
+        public void FromYCbCrAvx2(int seed) =>
+            this.TestConverter(new JpegColorConverterBase.FromYCbCrAvx(8), 3, seed);
+
+        [Theory]
+        [MemberData(nameof(Seeds))]
+        public void FromCmykAvx2(int seed) =>
+            this.TestConverter(new JpegColorConverterBase.FromCmykAvx(8), 4, seed);
+
+        [Theory]
+        [MemberData(nameof(Seeds))]
+        public void FromGrayscaleAvx2(int seed) =>
+            this.TestConverter(new JpegColorConverterBase.FromGrayscaleAvx(8), 1, seed);
+
+        [Theory]
+        [MemberData(nameof(Seeds))]
+        public void FromRgbAvx2(int seed) =>
+            this.TestConverter(new JpegColorConverterBase.FromRgbAvx(8), 3, seed);
+
         [Theory]
         [MemberData(nameof(Seeds))]
         public void FromYccKAvx2(int seed) =>