Avoid external dependency in HostBuilder_CanCustomizeServiceFactory test

Author: SteveSandersonMS

src/Components/test/Microsoft.AspNetCore.Components.Browser.Test/Hosting/WebAssemblyHostBuilderTest.cs

@@ -4,9 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Autofac;
-using Autofac.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.JSInterop;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Components.Hosting
@@ -81,42 +80,69 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         [Fact]
-        public void HostBuilder_ServiceFactory_Autofac()
+        public void HostBuilder_CanCustomizeServiceFactory()
         {
             // Arrange
             var builder = new WebAssemblyHostBuilder();
-            builder.ConfigureServices((c, s) => s.AddSingleton<IServiceProviderFactory<IServiceCollection>>(new MyServiceProviderFactory()));
+            builder.ConfigureServices((c, s) =>
+            {
+                s.AddSingleton<IServiceProviderFactory<IServiceCollection>>(
+                    new TestServiceProviderFactory());
+            });
 
             // Act
             var host = builder.Build();
 
             // Assert
-            Assert.IsType<AutofacServiceProvider>(host.Services);
+            Assert.IsType<TestServiceProvider>(host.Services);
         }
 
-        private class MyServiceProviderFactory : IServiceProviderFactory<IServiceCollection>
+        private class TestServiceProvider : IServiceProvider
         {
-            public IServiceCollection CreateBuilder(IServiceCollection services)
+            private readonly IServiceProvider _underlyingProvider;
+
+            public TestServiceProvider(IServiceProvider underlyingProvider)
             {
-                return new MyServiceCollection(services);
+                _underlyingProvider = underlyingProvider;
             }
 
-            public IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
+            public object GetService(Type serviceType)
             {
-                Assert.IsType<MyServiceCollection>(serviceCollection);
-                var containerBuilder = new ContainerBuilder();
-                containerBuilder.Populate(serviceCollection);
-                var container = containerBuilder.Build();
-                return new AutofacServiceProvider(container);
+                if (serviceType == typeof(IWebAssemblyHost))
+                {
+                    // Since the test will make assertions about the resulting IWebAssemblyHost,
+                    // show that custom DI containers have the power to substitute themselves
+                    // as the IServiceProvider
+                    return new WebAssemblyHost(
+                        this, _underlyingProvider.GetRequiredService<IJSRuntime>());
+                }
+                else
+                {
+                    return _underlyingProvider.GetService(serviceType);
+                }
             }
         }
 
-        private class MyServiceCollection : List<ServiceDescriptor>, IServiceCollection
+        private class TestServiceProviderFactory : IServiceProviderFactory<IServiceCollection>
         {
-            public MyServiceCollection(IEnumerable<ServiceDescriptor> collection) : base(collection)
+            public IServiceCollection CreateBuilder(IServiceCollection services)
             {
+                return new TestServiceCollection(services);
             }
-        }
 
+            public IServiceProvider CreateServiceProvider(IServiceCollection serviceCollection)
+            {
+                Assert.IsType<TestServiceCollection>(serviceCollection);
+                return new TestServiceProvider(serviceCollection.BuildServiceProvider());
+            }
+
+            class TestServiceCollection : List<ServiceDescriptor>, IServiceCollection
+            {
+                public TestServiceCollection(IEnumerable<ServiceDescriptor> collection)
+                    : base(collection)
+                {
+                }
+            }
+        }
     }
 }

src/Components/test/Microsoft.AspNetCore.Components.Browser.Test/Microsoft.AspNetCore.Components.Browser.Test.csproj

@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />