Add additional command converter DI tests

Author: JimBobSquarePants

tests/ImageSharp.Web.Tests/DependencyInjection/MockCommandConverter.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Globalization;
+using SixLabors.ImageSharp.Web.Commands;
+using SixLabors.ImageSharp.Web.Commands.Converters;
+
+namespace SixLabors.ImageSharp.Web.Tests.DependencyInjection
+{
+    public class MockCommandConverter : ICommandConverter
+    {
+        public Type Type => typeof(MockCommandConverter);
+
+        public object ConvertFrom(
+            CommandParser parser,
+            CultureInfo culture,
+            string value,
+            Type propertyType)
+            => null;
+    }
+}

tests/ImageSharp.Web.Tests/DependencyInjection/ServiceRegistrationExtensionsTests.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.Caching;
 using SixLabors.ImageSharp.Web.Commands;
+using SixLabors.ImageSharp.Web.Commands.Converters;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using SixLabors.ImageSharp.Web.Processors;
 using SixLabors.ImageSharp.Web.Providers;
@@ -27,6 +28,53 @@ public void DefaultServicesAreRegistered()
             Assert.Contains(services, x => x.ServiceType == typeof(IImageWebProcessor) && x.ImplementationType == typeof(ResizeWebProcessor));
             Assert.Contains(services, x => x.ServiceType == typeof(IImageWebProcessor) && x.ImplementationType == typeof(FormatWebProcessor));
             Assert.Contains(services, x => x.ServiceType == typeof(IImageWebProcessor) && x.ImplementationType == typeof(BackgroundColorWebProcessor));
+            Assert.Contains(services, x => x.ServiceType == typeof(CommandParser));
+
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<sbyte>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<byte>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<short>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<ushort>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<int>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<uint>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<long>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(IntegralNumberConverter<ulong>));
+
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(SimpleCommandConverter<decimal>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(SimpleCommandConverter<float>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(SimpleCommandConverter<double>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(SimpleCommandConverter<string>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(SimpleCommandConverter<bool>));
+
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<sbyte>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<byte>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<short>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<ushort>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<int>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<uint>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<long>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<ulong>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<decimal>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<float>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<double>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<string>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ArrayConverter<bool>));
+
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<sbyte>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<byte>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<short>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<ushort>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<int>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<uint>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<long>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<ulong>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<decimal>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<float>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<double>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<string>));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ListConverter<bool>));
+
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(ColorConverter));
+            Assert.Contains(services, x => x.ServiceType == typeof(ICommandConverter) && x.ImplementationType == typeof(EnumConverter));
         }
 
         [Fact]
@@ -156,5 +204,69 @@ public void CanAddRemoveAllFactoryImageProcessors()
 
             Assert.DoesNotContain(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockWebProcessor));
         }
+
+        [Fact]
+        public void CanAddRemoveCommandConverters()
+        {
+            var services = new ServiceCollection();
+
+            IImageSharpBuilder builder = services.AddImageSharp()
+                                      .AddConverter<MockCommandConverter>();
+
+            Assert.Contains(services, x => x.ImplementationType == typeof(MockCommandConverter));
+
+            builder.RemoveConverter<MockCommandConverter>();
+
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockCommandConverter));
+        }
+
+        [Fact]
+        public void CanAddRemoveFactoryCommandConverters()
+        {
+            var services = new ServiceCollection();
+
+            IImageSharpBuilder builder = services.AddImageSharp()
+                                  .AddConverter(_ => new MockCommandConverter());
+
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockCommandConverter));
+
+            Assert.Contains(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockCommandConverter));
+
+            builder.RemoveConverter<MockCommandConverter>();
+
+            Assert.DoesNotContain(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockCommandConverter));
+        }
+
+        [Fact]
+        public void CanAddRemoveAllCommandConverters()
+        {
+            var services = new ServiceCollection();
+
+            IImageSharpBuilder builder = services.AddImageSharp()
+                                      .AddConverter<MockCommandConverter>();
+
+            Assert.Contains(services, x => x.ImplementationType == typeof(MockCommandConverter));
+
+            builder.ClearConverters();
+
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockCommandConverter));
+        }
+
+        [Fact]
+        public void CanAddRemoveAllFactoryCommandConverters()
+        {
+            var services = new ServiceCollection();
+
+            IImageSharpBuilder builder = services.AddImageSharp()
+                                  .AddConverter(_ => new MockCommandConverter());
+
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockCommandConverter));
+
+            Assert.Contains(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockCommandConverter));
+
+            builder.ClearConverters();
+
+            Assert.DoesNotContain(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockCommandConverter));
+        }
     }
 }