Add processor tests

Author: JimBobSquarePants

src/ImageSharp.Web/FormattedImage.cs

@@ -21,7 +21,7 @@ public sealed class FormattedImage : IDisposable
         /// </summary>
         /// <param name="image">The image.</param>
         /// <param name="format">The format.</param>
-        public FormattedImage(Image<Rgba32> image, IImageFormat format)
+        internal FormattedImage(Image<Rgba32> image, IImageFormat format)
         {
             this.format = format;
             this.Image = image;

src/ImageSharp.Web/Processors/WebProcessingExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System.Collections.Generic;
@@ -18,25 +18,22 @@ internal static class WebProcessingExtensions
         /// <param name="logger">The type used for performing logging.</param>
         /// <param name="processors">The collection of available processors.</param>
         /// <param name="commands">The parsed collection of processing commands.</param>
-        /// <returns>The <see cref="Image{Rgba32}"/>.</returns>
-        /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image.</remarks>
+        /// <returns>The <see cref="FormattedImage"/>.</returns>
         public static FormattedImage Process(
             this FormattedImage source,
             ILogger logger,
             IEnumerable<IImageWebProcessor> processors,
             IDictionary<string, string> commands)
         {
-            if (commands.Count == 0)
+            if (commands.Count != 0)
             {
-                return source;
-            }
-
-            foreach (IImageWebProcessor processor in processors)
-            {
-                source = processor.Process(source, logger, commands);
+                foreach (IImageWebProcessor processor in processors)
+                {
+                    source = processor.Process(source, logger, commands);
+                }
             }
 
             return source;
         }
     }
-}
+}

tests/ImageSharp.Web.Tests/Processors/BackgroundColorWebProcessorTests.cs

@@ -0,0 +1,31 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Collections.Generic;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Web.Processors;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Web.Tests.Processors
+{
+    public class BackgroundColorWebProcessorTests
+    {
+        [Fact]
+        public void BackgroundColorWebProcessor_UpdatesColor()
+        {
+            var commands = new Dictionary<string, string>
+            {
+                { BackgroundColorWebProcessor.Color, nameof(Color.Orange) }
+            };
+
+            using var image = new Image<Rgba32>(1, 1);
+            Assert.True(Color.Transparent.Equals(image[0, 0]));
+
+            using var formatted = new FormattedImage(image, PngFormat.Instance);
+            new BackgroundColorWebProcessor().Process(formatted, null, commands);
+
+            Assert.True(Color.Orange.Equals(image[0, 0]));
+        }
+    }
+}

tests/ImageSharp.Web.Tests/Processors/FormatWebProcessorTests.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Collections.Generic;
+using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Formats.Gif;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Web.Middleware;
+using SixLabors.ImageSharp.Web.Processors;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Web.Tests.Processors
+{
+    public class FormatWebProcessorTests
+    {
+        [Fact]
+        public void FormatWebProcessor_UpdatesFormat()
+        {
+            var commands = new Dictionary<string, string>
+            {
+                { FormatWebProcessor.Format, GifFormat.Instance.Name },
+            };
+
+            using var image = new Image<Rgba32>(1, 1);
+            using var formatted = new FormattedImage(image, PngFormat.Instance);
+            Assert.Equal(formatted.Format, PngFormat.Instance);
+
+            new FormatWebProcessor(Options.Create(new ImageSharpMiddlewareOptions()))
+                .Process(formatted, null, commands);
+
+            Assert.Equal(formatted.Format, GifFormat.Instance);
+        }
+    }
+}

tests/ImageSharp.Web.Tests/Processors/ResizeWebProcessorTests.cs

@@ -0,0 +1,36 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System.Collections.Generic;
+using SixLabors.ImageSharp.Formats.Png;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Web.Processors;
+using Xunit;
+
+namespace SixLabors.ImageSharp.Web.Tests.Processors
+{
+    public class ResizeWebProcessorTests
+    {
+        [Fact]
+        public void ResizeWebProcessor_UpdatesSize()
+        {
+            const int Width = 4;
+            const int Height = 6;
+            var commands = new Dictionary<string, string>
+            {
+                { ResizeWebProcessor.Sampler, nameof(KnownResamplers.NearestNeighbor) },
+                { ResizeWebProcessor.Width, Width.ToString() },
+                { ResizeWebProcessor.Height, Height.ToString() },
+                { ResizeWebProcessor.Xy, "0,0" }
+            };
+
+            using var image = new Image<Rgba32>(1, 1);
+            using var formatted = new FormattedImage(image, PngFormat.Instance);
+            new ResizeWebProcessor().Process(formatted, null, commands);
+
+            Assert.Equal(Width, image.Width);
+            Assert.Equal(Height, image.Height);
+        }
+    }
+}