From 78bb139128f5ccb1b0276216f507fd541afc9634 Mon Sep 17 00:00:00 2001
From: Anton Firszov <antonfir@gmail.com>
Date: Sun, 17 Jun 2018 19:50:59 +0200
Subject: [PATCH] common test cases for Image.Load(byte) and Image.Load(span)
 overloads

---
 src/ImageSharp/Image.FromBytes.cs             | 113 ++++++++++++++----
 .../Image/ImageTests.ImageLoadTestBase.cs     |  11 +-
 .../Image/ImageTests.Load_FromBytes.cs        |  86 ++++++++++---
 3 files changed, 161 insertions(+), 49 deletions(-)

diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs
index 44c53d7767..7e55fe7871 100644
--- a/src/ImageSharp/Image.FromBytes.cs
+++ b/src/ImageSharp/Image.FromBytes.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using System;
 using System.IO;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.PixelFormats;
@@ -15,7 +16,7 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// By reading the header on the provided byte array this calculates the images format.
         /// </summary>
-        /// <param name="data">The byte array containing image data to read the header from.</param>
+        /// <param name="data">The byte array containing encoded image data to read the header from.</param>
         /// <returns>The format or null if none found.</returns>
         public static IImageFormat DetectFormat(byte[] data)
         {
@@ -26,7 +27,7 @@ namespace SixLabors.ImageSharp
         /// By reading the header on the provided byte array this calculates the images format.
         /// </summary>
         /// <param name="config">The configuration.</param>
-        /// <param name="data">The byte array containing image data to read the header from.</param>
+        /// <param name="data">The byte array containing encoded image data to read the header from.</param>
         /// <returns>The mime type or null if none found.</returns>
         public static IImageFormat DetectFormat(Configuration config, byte[] data)
         {
@@ -37,30 +38,30 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="data">The byte array containing image data.</param>
         /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
         public static Image<Rgba32> Load(byte[] data) => Load<Rgba32>(Configuration.Default, data);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
         /// </summary>
-        /// <param name="data">The byte array containing image data.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
         /// <param name="format">The mime type of the decoded image.</param>
         /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
         public static Image<Rgba32> Load(byte[] data, out IImageFormat format) => Load<Rgba32>(Configuration.Default, data, out format);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The config for the decoder.</param>
-        /// <param name="data">The byte array containing image data.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
         /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
         public static Image<Rgba32> Load(Configuration config, byte[] data) => Load<Rgba32>(config, data);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="data">The byte array containing image data.</param>
@@ -69,15 +70,15 @@ namespace SixLabors.ImageSharp
         public static Image<Rgba32> Load(Configuration config, byte[] data, out IImageFormat format) => Load<Rgba32>(config, data, out format);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
         /// </summary>
-        /// <param name="data">The byte array containing image data.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
         /// <param name="decoder">The decoder.</param>
         /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
         public static Image<Rgba32> Load(byte[] data, IImageDecoder decoder) => Load<Rgba32>(data, decoder);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{Rgba32}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="data">The byte array containing image data.</param>
@@ -86,9 +87,9 @@ namespace SixLabors.ImageSharp
         public static Image<Rgba32> Load(Configuration config, byte[] data, IImageDecoder decoder) => Load<Rgba32>(config, data, decoder);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte array.
         /// </summary>
-        /// <param name="data">The byte array containing image data.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
         public static Image<TPixel> Load<TPixel>(byte[] data)
@@ -96,7 +97,7 @@ namespace SixLabors.ImageSharp
             => Load<TPixel>(Configuration.Default, data);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="format">The mime type of the decoded image.</param>
@@ -107,10 +108,10 @@ namespace SixLabors.ImageSharp
             => Load<TPixel>(Configuration.Default, data, out format);
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The configuration options.</param>
-        /// <param name="data">The byte array containing image data.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
         public static Image<TPixel> Load<TPixel>(Configuration config, byte[] data)
@@ -123,11 +124,11 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The configuration options.</param>
-        /// <param name="data">The byte array containing image data.</param>
-        /// <param name="format">The mime type of the decoded image.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
+        /// <param name="format">The <see cref="IImageFormat"/> of the decoded image.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
         public static Image<TPixel> Load<TPixel>(Configuration config, byte[] data, out IImageFormat format)
@@ -140,9 +141,9 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte array.
         /// </summary>
-        /// <param name="data">The byte array containing image data.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
         /// <param name="decoder">The decoder.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
@@ -156,10 +157,10 @@ namespace SixLabors.ImageSharp
         }
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TPixel}"/> class from the given byte array.
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte array.
         /// </summary>
         /// <param name="config">The Configuration.</param>
-        /// <param name="data">The byte array containing image data.</param>
+        /// <param name="data">The byte array containing encoded image data.</param>
         /// <param name="decoder">The decoder.</param>
         /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
@@ -171,5 +172,71 @@ namespace SixLabors.ImageSharp
                 return Load<TPixel>(config, memoryStream, decoder);
             }
         }
+
+        /// <summary>
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte span.
+        /// </summary>
+        /// <param name="data">The byte span containing image data.</param>
+        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        public static Image<Rgba32> Load(ReadOnlySpan<byte> data) => Load<Rgba32>(Configuration.Default, data);
+
+        /// <summary>
+        /// Load a new instance of <see cref="Image{Rgba32}"/> from the given encoded byte span.
+        /// </summary>
+        /// <param name="config">The config for the decoder.</param>
+        /// <param name="data">The byte span containing encoded image data.</param>
+        /// <returns>A new <see cref="Image{Rgba32}"/>.</returns>
+        public static Image<Rgba32> Load(Configuration config, ReadOnlySpan<byte> data) => Load<Rgba32>(config, data);
+
+        /// <summary>
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte span.
+        /// </summary>
+        /// <param name="data">The byte span containing encoded image data.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Load<TPixel>(ReadOnlySpan<byte> data)
+            where TPixel : struct, IPixel<TPixel>
+            => Load<TPixel>(Configuration.Default, data);
+
+        /// <summary>
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte span.
+        /// </summary>
+        /// <param name="config">The configuration options.</param>
+        /// <param name="data">The byte span containing encoded image data.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Load<TPixel>(Configuration config, ReadOnlySpan<byte> data)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte span.
+        /// </summary>
+        /// <param name="config">The Configuration.</param>
+        /// <param name="data">The byte span containing image data.</param>
+        /// <param name="decoder">The decoder.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Load<TPixel>(Configuration config, ReadOnlySpan<byte> data, IImageDecoder decoder)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Load a new instance of <see cref="Image{TPixel}"/> from the given encoded byte span.
+        /// </summary>
+        /// <param name="config">The configuration options.</param>
+        /// <param name="data">The byte span containing image data.</param>
+        /// <param name="format">The <see cref="IImageFormat"/> of the decoded image.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <returns>A new <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Load<TPixel>(Configuration config, ReadOnlySpan<byte> data, out IImageFormat format)
+            where TPixel : struct, IPixel<TPixel>
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs b/tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs
index 86e73fb9fe..8e7d56dde0 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.ImageLoadTestBase.cs
@@ -13,14 +13,10 @@
     {
         public abstract class ImageLoadTestBase : IDisposable
         {
-            
-
             protected Image<Rgba32> returnImage;
 
             protected Mock<IImageDecoder> localDecoder;
 
-            
-
             protected IImageFormatDetector localMimeTypeDetector;
 
             protected Mock<IImageFormat> localImageFormatMock;
@@ -35,9 +31,9 @@
             /// </summary>
             public Configuration TopLevelConfiguration { get; }
 
-            public byte[] Marker { get; private set; }
+            public byte[] Marker { get; }
 
-            public MemoryStream DataStream { get; private set; }
+            public MemoryStream DataStream { get; }
 
             public byte[] DecodedData { get; private set; }
 
@@ -50,7 +46,6 @@
                 this.localDecoder = new Mock<IImageDecoder>();
                 this.localMimeTypeDetector = new MockImageFormatDetector(this.localImageFormatMock.Object);
                 this.localDecoder.Setup(x => x.Decode<Rgba32>(It.IsAny<Configuration>(), It.IsAny<Stream>()))
-
                     .Callback<Configuration, Stream>((c, s) =>
                         {
                             using (var ms = new MemoryStream())
@@ -61,8 +56,6 @@
                         })
                     .Returns(this.returnImage);
 
-                
-
                 this.LocalConfiguration = new Configuration
                                               {
                                               };
diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes.cs b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes.cs
index 23738758d8..b1041a93d4 100644
--- a/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes.cs
+++ b/tests/ImageSharp.Tests/Image/ImageTests.Load_FromBytes.cs
@@ -1,9 +1,13 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
-
+using System;
 using System.IO;
+
 using Moq;
+
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.Primitives;
+
 using Xunit;
 
 // ReSharper disable InconsistentNaming
@@ -13,10 +17,22 @@ namespace SixLabors.ImageSharp.Tests
     {
         public class Load_FromBytes : ImageLoadTestBase
         {
-            [Fact]
-            public void BasicCase()
+            private byte[] ByteArray => this.DataStream.ToArray();
+
+            private ReadOnlySpan<byte> ByteSpan => this.ByteArray.AsSpan();
+
+            private byte[] ActualImageBytes => TestFile.Create(TestImages.Bmp.F).Bytes;
+
+            private ReadOnlySpan<byte> ActualImageSpan => this.ActualImageBytes.AsSpan();
+
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void BasicCase(bool useSpan)
             {
-                var img = Image.Load(this.TopLevelConfiguration, this.DataStream.ToArray());
+                Image<Rgba32> img = useSpan
+                                        ? Image.Load(this.TopLevelConfiguration, this.ByteSpan)
+                                        : Image.Load(this.TopLevelConfiguration, this.ByteArray);
 
                 Assert.NotNull(img);
                 Assert.Equal(this.TestFormat.Sample<Rgba32>(), img);
@@ -24,10 +40,14 @@ namespace SixLabors.ImageSharp.Tests
                 this.TestFormat.VerifyDecodeCall(this.Marker, this.TopLevelConfiguration);
             }
 
-            [Fact]
-            public void NonDefaultPixelType()
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void NonDefaultPixelType(bool useSpan)
             {
-                var img = Image.Load<Rgb24>(this.TopLevelConfiguration, this.DataStream.ToArray());
+                Image<Rgb24> img = useSpan
+                                       ? Image.Load<Rgb24>(this.TopLevelConfiguration, this.ByteSpan)
+                                       : Image.Load<Rgb24>(this.TopLevelConfiguration, this.ByteArray);
 
                 Assert.NotNull(img);
                 Assert.Equal(this.TestFormat.Sample<Rgb24>(), img);
@@ -35,10 +55,14 @@ namespace SixLabors.ImageSharp.Tests
                 this.TestFormat.VerifyDecodeCall(this.Marker, this.TopLevelConfiguration);
             }
 
-            [Fact]
-            public void UseLocalConfiguration()
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void UseLocalConfiguration(bool useSpan)
             {
-                var img = Image.Load<Rgba32>(this.LocalConfiguration, this.DataStream.ToArray());
+                Image<Rgba32> img = useSpan
+                                        ? Image.Load<Rgba32>(this.LocalConfiguration, this.ByteSpan)
+                                        : Image.Load<Rgba32>(this.LocalConfiguration, this.ByteArray);
 
                 Assert.NotNull(img);
 
@@ -47,18 +71,46 @@ namespace SixLabors.ImageSharp.Tests
                 Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
             }
 
-            [Fact]
-            public void UseCustomDecoder()
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void UseCustomDecoder(bool useSpan)
             {
-                var img = Image.Load<Rgba32>(
-                    this.TopLevelConfiguration,
-                    this.DataStream.ToArray(),
-                    this.localDecoder.Object);
-
+                Image<Rgba32> img = useSpan
+                                        ? Image.Load<Rgba32>(
+                                            this.TopLevelConfiguration,
+                                            this.ByteSpan,
+                                            this.localDecoder.Object)
+                                        : Image.Load<Rgba32>(
+                                            this.TopLevelConfiguration,
+                                            this.ByteArray,
+                                            this.localDecoder.Object);
                 Assert.NotNull(img);
                 this.localDecoder.Verify(x => x.Decode<Rgba32>(this.TopLevelConfiguration, It.IsAny<Stream>()));
                 Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
             }
+
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void UseGlobalConfiguration(bool useSpan)
+            {
+                Image<Rgba32> img = useSpan ? Image.Load(this.ActualImageSpan) : Image.Load(this.ActualImageBytes);
+
+                Assert.Equal(new Size(108, 202), img.Size());
+            }
+
+            [Theory]
+            [InlineData(false)]
+            [InlineData(true)]
+            public void UseGlobalConfiguration_NonDefaultPixelType(bool useSpan)
+            {
+                Image<Rgb24> img = useSpan
+                                       ? Image.Load<Rgb24>(this.ActualImageSpan)
+                                       : Image.Load<Rgb24>(this.ActualImageBytes);
+
+                Assert.Equal(new Size(108, 202), img.Size());
+            }
         }
     }
 }
\ No newline at end of file