Fix typo + tests

aspnet · Jan 18, 2018 · e54095c · e54095c
1 parent 4c634c9
commit e54095c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/Kestrel/WebHostBuilderKestrelExtensions.cs b/src/Kestrel/WebHostBuilderKestrelExtensions.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Hosting
@@ -28,7 +29,7 @@ public static IWebHostBuilder UseKestrel(this IWebHostBuilder hostBuilder)
             return hostBuilder.ConfigureServices(services =>
             {
                 // Don't override an already-configured transport
-                services.AddSingleton<ITransportFactory, LibuvTransportFactory>();
+                services.TryAddSingleton<ITransportFactory, LibuvTransportFactory>();
 
                 services.AddTransient<IConfigureOptions<KestrelServerOptions>, KestrelServerOptionsSetup>();
                 services.AddSingleton<IServer, KestrelServer>();

diff --git a/test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs b/test/Kestrel.Tests/WebHostBuilderKestrelExtensionsTests.cs
@@ -61,26 +61,39 @@ public void LibuvIsTheDefaultTransport()
         }
 
         [Fact]
-        public void LibuvTransportCanBeManuallySelected()
+        public void LibuvTransportCanBeManuallySelectedIndependentOfOrder()
         {
             var hostBuilder = new WebHostBuilder()
                 .UseKestrel()
                 .UseLibuv()
                 .Configure(app => { });
 
             Assert.IsType<LibuvTransportFactory>(hostBuilder.Build().Services.GetService<ITransportFactory>());
-        }
 
+            var hostBuilderReversed = new WebHostBuilder()
+                .UseLibuv()
+                .UseKestrel()
+                .Configure(app => { });
+
+            Assert.IsType<LibuvTransportFactory>(hostBuilderReversed.Build().Services.GetService<ITransportFactory>());
+        }
 
         [Fact]
-        public void SocketsTransportCanBeManuallySelected()
+        public void SocketsTransportCanBeManuallySelectedIndependentOfOrder()
         {
             var hostBuilder = new WebHostBuilder()
                 .UseKestrel()
                 .UseSockets()
                 .Configure(app => { });
 
             Assert.IsType<SocketTransportFactory>(hostBuilder.Build().Services.GetService<ITransportFactory>());
+
+            var hostBuilderReversed = new WebHostBuilder()
+                .UseSockets()
+                .UseKestrel()
+                .Configure(app => { });
+
+            Assert.IsType<SocketTransportFactory>(hostBuilderReversed.Build().Services.GetService<ITransportFactory>());
         }
     }
 }