Add detect color type tests

Author: brianpopow

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

@@ -67,16 +67,13 @@ public void MetadataIsParsedCorrectly(
             string imagePath,
             int expectedPixelSize,
             bool exifProfilePresent,
-            bool iccProfilePresent)
-        {
-            TestMetadataImpl(
+            bool iccProfilePresent) => TestMetadataImpl(
                 useIdentify,
                 JpegDecoder,
                 imagePath,
                 expectedPixelSize,
                 exifProfilePresent,
                 iccProfilePresent);
-        }
 
         [Theory]
         [MemberData(nameof(RatioFiles))]
@@ -133,15 +130,45 @@ public void Decode_VerifyQuality(string imagePath, int quality)
             var testFile = TestFile.Create(imagePath);
             using (var stream = new MemoryStream(testFile.Bytes, false))
             {
-                var decoder = new JpegDecoder();
-                using (Image<Rgba32> image = decoder.Decode<Rgba32>(Configuration.Default, stream))
+                using (Image<Rgba32> image = JpegDecoder.Decode<Rgba32>(Configuration.Default, stream))
                 {
                     JpegMetadata meta = image.Metadata.GetJpegMetadata();
                     Assert.Equal(quality, meta.Quality);
                 }
             }
         }
 
+        [Theory]
+        [InlineData(TestImages.Jpeg.Baseline.Floorplan, JpegColorType.Luminance)]
+        [InlineData(TestImages.Jpeg.Baseline.Jpeg420Small, JpegColorType.YCbCrRatio420)]
+        [InlineData(TestImages.Jpeg.Baseline.Jpeg444, JpegColorType.YCbCrRatio444)]
+        [InlineData(TestImages.Jpeg.Baseline.JpegRgb, JpegColorType.Rgb)]
+        public void Identify_DetectsCorrectColorType(string imagePath, JpegColorType expectedColorType)
+        {
+            var testFile = TestFile.Create(imagePath);
+            using (var stream = new MemoryStream(testFile.Bytes, false))
+            {
+                IImageInfo image = JpegDecoder.Identify(Configuration.Default, stream);
+                JpegMetadata meta = image.Metadata.GetJpegMetadata();
+                Assert.Equal(expectedColorType, meta.ColorType);
+            }
+        }
+
+        [Theory]
+        [WithFile(TestImages.Jpeg.Baseline.Floorplan, PixelTypes.Rgba32, JpegColorType.Luminance)]
+        [WithFile(TestImages.Jpeg.Baseline.Jpeg420Small, PixelTypes.Rgba32, JpegColorType.YCbCrRatio420)]
+        [WithFile(TestImages.Jpeg.Baseline.Jpeg444, PixelTypes.Rgba32, JpegColorType.YCbCrRatio444)]
+        [WithFile(TestImages.Jpeg.Baseline.JpegRgb, PixelTypes.Rgba32, JpegColorType.Rgb)]
+        public void Decode_DetectsCorrectColorType<TPixel>(TestImageProvider<TPixel> provider, JpegColorType expectedColorType)
+            where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using (Image<TPixel> image = provider.GetImage(JpegDecoder))
+            {
+                JpegMetadata meta = image.Metadata.GetJpegMetadata();
+                Assert.Equal(expectedColorType, meta.ColorType);
+            }
+        }
+
         private static void TestImageInfo(string imagePath, IImageDecoder decoder, bool useIdentify, Action<IImageInfo> test)
         {
             var testFile = TestFile.Create(imagePath);
@@ -161,9 +188,7 @@ private static void TestMetadataImpl(
             string imagePath,
             int expectedPixelSize,
             bool exifProfilePresent,
-            bool iccProfilePresent)
-        {
-            TestImageInfo(
+            bool iccProfilePresent) => TestImageInfo(
                 imagePath,
                 decoder,
                 useIdentify,
@@ -207,7 +232,6 @@ private static void TestMetadataImpl(
                             Assert.Null(iccProfile);
                         }
                     });
-        }
 
         [Theory]
         [InlineData(false)]
@@ -237,9 +261,7 @@ public void IgnoreMetadata_ControlsWhetherMetadataIsParsed(bool ignoreMetadata)
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
-        public void Decoder_Reads_Correct_Resolution_From_Jfif(bool useIdentify)
-        {
-            TestImageInfo(
+        public void Decoder_Reads_Correct_Resolution_From_Jfif(bool useIdentify) => TestImageInfo(
                 TestImages.Jpeg.Baseline.Floorplan,
                 JpegDecoder,
                 useIdentify,
@@ -248,14 +270,11 @@ public void Decoder_Reads_Correct_Resolution_From_Jfif(bool useIdentify)
                     Assert.Equal(300, imageInfo.Metadata.HorizontalResolution);
                     Assert.Equal(300, imageInfo.Metadata.VerticalResolution);
                 });
-        }
 
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
-        public void Decoder_Reads_Correct_Resolution_From_Exif(bool useIdentify)
-        {
-            TestImageInfo(
+        public void Decoder_Reads_Correct_Resolution_From_Exif(bool useIdentify) => TestImageInfo(
                 TestImages.Jpeg.Baseline.Jpeg420Exif,
                 JpegDecoder,
                 useIdentify,
@@ -264,6 +283,5 @@ public void Decoder_Reads_Correct_Resolution_From_Exif(bool useIdentify)
                         Assert.Equal(72, imageInfo.Metadata.HorizontalResolution);
                         Assert.Equal(72, imageInfo.Metadata.VerticalResolution);
                     });
-        }
     }
 }

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

@@ -180,7 +180,7 @@ public async Task Identify_IsCancellable()
         public void Issue1732_DecodesWithRgbColorSpace<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            using (Image<TPixel> image = provider.GetImage(new JpegDecoder()))
+            using (Image<TPixel> image = provider.GetImage(JpegDecoder))
             {
                 image.DebugSave(provider);
                 image.CompareToOriginal(provider);

tests/ImageSharp.Tests/TestImages.cs

@@ -190,6 +190,7 @@ public static class Bad
                 public const string Jpeg420Exif = "Jpg/baseline/jpeg420exif.jpg";
                 public const string Jpeg444 = "Jpg/baseline/jpeg444.jpg";
                 public const string Jpeg420Small = "Jpg/baseline/jpeg420small.jpg";
+                public const string JpegRgb = "Jpg/baseline/jpeg-rgb.jpg";
                 public const string Testorig420 = "Jpg/baseline/testorig.jpg";
                 public const string MultiScanBaselineCMYK = "Jpg/baseline/MultiScanBaselineCMYK.jpg";
                 public const string Ratio1x1 = "Jpg/baseline/ratio-1x1.jpg";