Remove bad test server implementation

Author: JimBobSquarePants

tests/ImageSharp.Web.Tests/Commands/QueryCollectionUriParserTests.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Six Labors.
+// Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
 using System;
@@ -20,10 +20,18 @@ public void QueryCollectionParserExtractsCommands()
                 { "height", "200" }
             };
 
-            HttpContext context = TestHelpers.CreateHttpContext();
+            HttpContext context = CreateHttpContext();
             IDictionary<string, string> actual = new QueryCollectionRequestParser().ParseRequestCommands(context);
 
             Assert.Equal(expected, actual);
         }
+
+        private static HttpContext CreateHttpContext()
+        {
+            var httpContext = new DefaultHttpContext();
+            httpContext.Request.Path = "/testwebsite.com/image-12345.jpeg";
+            httpContext.Request.QueryString = new QueryString("?width=400&height=200");
+            return httpContext;
+        }
     }
-}
+}

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

@@ -1,7 +1,6 @@
 // Copyright (c) Six Labors.
 // Licensed under the Apache License, Version 2.0.
 
-using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using SixLabors.ImageSharp.Web.DependencyInjection;
 using Xunit;
@@ -13,85 +12,65 @@ public class ServiceRegistrationExtensionsTests
         [Fact]
         public void CanAddRemoveImageProviders()
         {
-            void RemoveServices(IServiceCollection services)
-            {
-                IImageSharpBuilder builder = services.AddImageSharp()
-                                      .AddProvider<MockImageProvider>();
+            var services = new ServiceCollection();
 
-                Assert.Contains(services, x => x.ImplementationType == typeof(MockImageProvider));
+            IImageSharpBuilder builder = services.AddImageSharp()
+                .AddProvider<MockImageProvider>();
 
-                builder.RemoveProvider<MockImageProvider>();
+            Assert.Contains(services, x => x.ImplementationType == typeof(MockImageProvider));
 
-                Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockImageProvider));
-            }
+            builder.RemoveProvider<MockImageProvider>();
 
-            using (TestServer server = ImageSharpTestServer.CreateTestServer(ImageSharpTestServer.DefaultConfig, RemoveServices))
-            {
-            }
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockImageProvider));
         }
 
         [Fact]
         public void CanAddRemoveFactoryImageProviders()
         {
-            void RemoveServices(IServiceCollection services)
-            {
-                IImageSharpBuilder builder = services.AddImageSharp()
-                                      .AddProvider(_ => new MockImageProvider());
+            var services = new ServiceCollection();
 
-                Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockImageProvider));
+            IImageSharpBuilder builder = services.AddImageSharp()
+                                      .AddProvider(_ => new MockImageProvider());
 
-                Assert.Contains(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockImageProvider));
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockImageProvider));
 
-                builder.RemoveProvider<MockImageProvider>();
+            Assert.Contains(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockImageProvider));
 
-                Assert.DoesNotContain(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockImageProvider));
-            }
+            builder.RemoveProvider<MockImageProvider>();
 
-            using (TestServer server = ImageSharpTestServer.CreateTestServer(ImageSharpTestServer.DefaultConfig, RemoveServices))
-            {
-            }
+            Assert.DoesNotContain(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockImageProvider));
         }
 
         [Fact]
         public void CanAddRemoveImageProcessors()
         {
-            void RemoveServices(IServiceCollection services)
-            {
-                IImageSharpBuilder builder = services.AddImageSharp()
-                                      .AddProcessor<MockWebProcessor>();
+            var services = new ServiceCollection();
 
-                Assert.Contains(services, x => x.ImplementationType == typeof(MockWebProcessor));
+            IImageSharpBuilder builder = services.AddImageSharp()
+                                      .AddProcessor<MockWebProcessor>();
 
-                builder.RemoveProcessor<MockWebProcessor>();
+            Assert.Contains(services, x => x.ImplementationType == typeof(MockWebProcessor));
 
-                Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockWebProcessor));
-            }
+            builder.RemoveProcessor<MockWebProcessor>();
 
-            using (TestServer server = ImageSharpTestServer.CreateTestServer(ImageSharpTestServer.DefaultConfig, RemoveServices))
-            {
-            }
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockWebProcessor));
         }
 
         [Fact]
         public void CanAddRemoveFactoryImageProcessors()
         {
-            void RemoveServices(IServiceCollection services)
-            {
-                IImageSharpBuilder builder = services.AddImageSharp()
-                                      .AddProcessor(_ => new MockWebProcessor());
+            var services = new ServiceCollection();
 
-                Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockWebProcessor));
+            IImageSharpBuilder builder = services.AddImageSharp()
+                                  .AddProcessor(_ => new MockWebProcessor());
 
-                Assert.Contains(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockWebProcessor));
+            Assert.DoesNotContain(services, x => x.ImplementationType == typeof(MockWebProcessor));
 
-                builder.RemoveProcessor<MockWebProcessor>();
+            Assert.Contains(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockWebProcessor));
 
-                Assert.DoesNotContain(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockWebProcessor));
-            }
+            builder.RemoveProcessor<MockWebProcessor>();
 
-            using (TestServer server = ImageSharpTestServer.CreateTestServer(ImageSharpTestServer.DefaultConfig, RemoveServices))
-            {
-            }
+            Assert.DoesNotContain(services, x => x.ImplementationFactory?.Method.ReturnType == typeof(MockWebProcessor));
         }
     }
 }