fixup

Author: BrennanConroy

src/Hosting/Hosting/test/GenericWebHostBuilderTests.cs

@@ -165,20 +165,24 @@ private async Task AssertResponseContains(RequestDelegate app, string expectedTe
 
     private class FirstStartup
     {
-        public void ConfigureServices(IServiceCollection services) { }
-        
+        public void ConfigureServices(IServiceCollection services) { services.AddSingleton<FirstStartup>(); }
+
         public void Configure(IApplicationBuilder app)
         {
+            Assert.NotNull(app.ApplicationServices.GetService<FirstStartup>());
+            Assert.Null(app.ApplicationServices.GetService<SecondStartup>());
             app.Run(context => context.Response.WriteAsync("FirstStartup"));
         }
     }
 
     private class SecondStartup
     {
-        public void ConfigureServices(IServiceCollection services) { }
-        
+        public void ConfigureServices(IServiceCollection services) { services.AddSingleton<SecondStartup>(); }
+
         public void Configure(IApplicationBuilder app)
         {
+            Assert.Null(app.ApplicationServices.GetService<FirstStartup>());
+            Assert.NotNull(app.ApplicationServices.GetService<SecondStartup>());
             app.Run(context => context.Response.WriteAsync("SecondStartup"));
         }
     }

src/Hosting/Hosting/test/WebHostBuilderTests.cs

@@ -1681,11 +1681,11 @@ public void Configure(IWebHostBuilder builder)
                        // This check is required because MVC still uses the
                        // IWebHostEnvironment instance before the container is baked
 #pragma warning disable CS0618 // Type or member is obsolete
-                       var heDescriptor = services.SingleOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
+                       var heDescriptor = services.FirstOrDefault(s => s.ServiceType == typeof(IHostingEnvironment));
                        Assert.NotNull(heDescriptor);
                        Assert.NotNull(heDescriptor.ImplementationInstance);
 #pragma warning restore CS0618 // Type or member is obsolete
-                       var wheDescriptor = services.SingleOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
+                       var wheDescriptor = services.FirstOrDefault(s => s.ServiceType == typeof(IWebHostEnvironment));
                        Assert.NotNull(wheDescriptor);
                        Assert.NotNull(wheDescriptor.ImplementationInstance);
                    })

src/Mvc/Mvc.Testing/src/PublicAPI.Unshipped.txt

@@ -3,3 +3,4 @@ Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.StartServer(
 Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel() -> void
 Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel(int port) -> void
 Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.UseKestrel(System.Action<Microsoft.AspNetCore.Server.Kestrel.Core.KestrelServerOptions!>! configureKestrelOptions) -> void
+virtual Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactory<TEntryPoint>.CreateServer(System.IServiceProvider! serviceProvider) -> Microsoft.AspNetCore.TestHost.TestServer!

src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs

@@ -143,6 +143,7 @@ internal virtual WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Actio
         var factory = new DelegatedWebApplicationFactory(
             ClientOptions,
             CreateServer,
+            CreateServer,
             CreateHost,
             CreateWebHostBuilder,
             CreateHostBuilder,
@@ -337,7 +338,10 @@ private void ConfigureHostBuilder(IHostBuilder hostBuilder)
             }
             else
             {
-                webHostBuilder.UseTestServer();
+                webHostBuilder.ConfigureServices(services =>
+                {
+                    services.AddSingleton<IServer>(CreateServer);
+                });
             }
         });
         _host = CreateHost(hostBuilder);
@@ -565,10 +569,19 @@ private static void EnsureDepsFile()
     /// <returns>The <see cref="TestServer"/> with the bootstrapped application.</returns>
     protected virtual TestServer CreateServer(IWebHostBuilder builder) => new(builder);
 
+    /// <summary>
+    /// Creates the <see cref="TestServer"/> with the <see cref="IServiceProvider"/> from the bootstrapped application.
+    /// This is only called for applications using <see cref="IHostBuilder"/>. Applications based on
+    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateHost"/> instead.
+    /// </summary>
+    /// <param name="serviceProvider">The <see cref="IServiceProvider"/> from the bootstrapped application.</param>
+    /// <returns></returns>
+    protected virtual TestServer CreateServer(IServiceProvider serviceProvider) => new(serviceProvider);
+
     /// <summary>
     /// Creates the <see cref="IHost"/> with the bootstrapped application in <paramref name="builder"/>.
     /// This is only called for applications using <see cref="IHostBuilder"/>. Applications based on
-    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateServer"/> instead.
+    /// <see cref="IWebHostBuilder"/> will use <see cref="CreateServer(IWebHostBuilder)"/> instead.
     /// </summary>
     /// <param name="builder">The <see cref="IHostBuilder"/> used to create the host.</param>
     /// <returns>The <see cref="IHost"/> with the bootstrapped application.</returns>
@@ -801,6 +814,7 @@ public virtual async ValueTask DisposeAsync()
     private sealed class DelegatedWebApplicationFactory : WebApplicationFactory<TEntryPoint>
     {
         private readonly Func<IWebHostBuilder, TestServer> _createServer;
+        private readonly Func<IServiceProvider, TestServer> _createServerFromServiceProvider;
         private readonly Func<IHostBuilder, IHost> _createHost;
         private readonly Func<IWebHostBuilder?> _createWebHostBuilder;
         private readonly Func<IHostBuilder?> _createHostBuilder;
@@ -810,6 +824,7 @@ private sealed class DelegatedWebApplicationFactory : WebApplicationFactory<TEnt
         public DelegatedWebApplicationFactory(
             WebApplicationFactoryClientOptions options,
             Func<IWebHostBuilder, TestServer> createServer,
+            Func<IServiceProvider, TestServer> createServerFromServiceProvider,
             Func<IHostBuilder, IHost> createHost,
             Func<IWebHostBuilder?> createWebHostBuilder,
             Func<IHostBuilder?> createHostBuilder,
@@ -819,6 +834,7 @@ public DelegatedWebApplicationFactory(
         {
             ClientOptions = new WebApplicationFactoryClientOptions(options);
             _createServer = createServer;
+            _createServerFromServiceProvider = createServerFromServiceProvider;
             _createHost = createHost;
             _createWebHostBuilder = createWebHostBuilder;
             _createHostBuilder = createHostBuilder;
@@ -829,6 +845,8 @@ public DelegatedWebApplicationFactory(
 
         protected override TestServer CreateServer(IWebHostBuilder builder) => _createServer(builder);
 
+        protected override TestServer CreateServer(IServiceProvider serviceProvider) => _createServerFromServiceProvider(serviceProvider);
+
         protected override IHost CreateHost(IHostBuilder builder) => _createHost(builder);
 
         protected override IWebHostBuilder? CreateWebHostBuilder() => _createWebHostBuilder();
@@ -846,6 +864,7 @@ internal override WebApplicationFactory<TEntryPoint> WithWebHostBuilderCore(Acti
             return new DelegatedWebApplicationFactory(
                 ClientOptions,
                 _createServer,
+                _createServerFromServiceProvider,
                 _createHost,
                 _createWebHostBuilder,
                 _createHostBuilder,

src/Mvc/test/Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs

@@ -3,10 +3,9 @@
 
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.WebEncoders.Testing;
-using Xunit.Abstractions;
 
 namespace Microsoft.AspNetCore.Mvc.FunctionalTests;
 
@@ -20,9 +19,9 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
         base.ConfigureWebHost(builder);
         builder.ConfigureServices(services =>
         {
-            services.TryAddTransient<HtmlEncoder, HtmlTestEncoder>();
-            services.TryAddTransient<JavaScriptEncoder, JavaScriptTestEncoder>();
-            services.TryAddTransient<UrlEncoder, UrlTestEncoder>();
+            services.AddTransient<HtmlEncoder, HtmlTestEncoder>();
+            services.AddTransient<JavaScriptEncoder, JavaScriptTestEncoder>();
+            services.AddTransient<UrlEncoder, UrlTestEncoder>();
         });
     }
 }

src/Mvc/test/Mvc.FunctionalTests/RazorBuildTest.cs

@@ -25,7 +25,6 @@ protected override void Initialize(TestContext context, MethodInfo methodInfo, o
     {
         base.Initialize(context, methodInfo, testMethodArguments, testOutputHelper);
         Factory = new MvcTestFixture<RazorBuildWebSite.Startup>(LoggerFactory)
-            .WithWebHostBuilder(b => b.UseStartup<RazorBuildWebSite.Startup>())
             .WithWebHostBuilder(b => b.ConfigureTestServices(serviceCollection => serviceCollection.Configure<MvcRazorRuntimeCompilationOptions>(ConfigureRuntimeCompilationOptions)));
 
         static void ConfigureRuntimeCompilationOptions(MvcRazorRuntimeCompilationOptions options)

src/Mvc/test/Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs

@@ -26,11 +26,11 @@ public void TestingInfrastructure_WebHost_WithWebHostBuilderRespectsCustomizatio
         // Assert
         Assert.Equal(new[] { "ConfigureWebHost", "Customization", "FurtherCustomization" }, factory.ConfigureWebHostCalled.ToArray());
         Assert.True(factory.CreateServerCalled);
-        Assert.True(factory.CreateWebHostBuilderCalled);
+        Assert.False(factory.CreateWebHostBuilderCalled);
         // GetTestAssemblies is not called when reading content roots from MvcAppManifest
         Assert.False(factory.GetTestAssembliesCalled);
         Assert.True(factory.CreateHostBuilderCalled);
-        Assert.False(factory.CreateHostCalled);
+        Assert.True(factory.CreateHostCalled);
     }
 
     [Fact]
@@ -48,7 +48,7 @@ public void TestingInfrastructure_GenericHost_WithWithHostBuilderRespectsCustomi
         Assert.False(factory.GetTestAssembliesCalled);
         Assert.True(factory.CreateHostBuilderCalled);
         Assert.True(factory.CreateHostCalled);
-        Assert.False(factory.CreateServerCalled);
+        Assert.True(factory.CreateServerCalled);
         Assert.False(factory.CreateWebHostBuilderCalled);
     }
 
@@ -147,6 +147,12 @@ protected override TestServer CreateServer(IWebHostBuilder builder)
             return base.CreateServer(builder);
         }
 
+        protected override TestServer CreateServer(IServiceProvider serviceProvider)
+        {
+            CreateServerCalled = true;
+            return base.CreateServer(serviceProvider);
+        }
+
         protected override IHost CreateHost(IHostBuilder builder)
         {
             CreateHostCalled = true;